ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3095 from open-osrs/upstream-1712

Browse Source
This commit is contained in:
Owain van Brakel
2021-12-17 14:32:20 +01:00
committed by GitHub
parent 00079b60cd 1e9dbf9a3c
commit 2a2b1e3219
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
View File

@@ -710,13 +710,15 @@ public class GrandExchangePlugin extends Plugin
case "setGETitle": case "setGETitle":
setGeTitle(); setGeTitle();
break; break;
case "geExamineText": case "geBuyExamineText":
case "geSellExamineText":
{ {
boolean buy = "geBuyExamineText".equals(event.getEventName());
String[] stack = client.getStringStack(); String[] stack = client.getStringStack();
int sz = client.getStringStackSize(); int sz = client.getStringStackSize();
String fee = stack[sz - 2]; String fee = stack[sz - 2];
String examine = stack[sz - 3]; String examine = stack[sz - 3];
String text = setExamineText(examine, fee); String text = setExamineText(examine, fee, buy);
if (text != null) if (text != null)
{ {
stack[sz - 1] = text; stack[sz - 1] = text;
@@ -807,12 +809,12 @@ public class GrandExchangePlugin extends Plugin
} }
} }
private String setExamineText(String examine, String fee) private String setExamineText(String examine, String fee, boolean buy)
{ {
final int itemId = client.getVar(VarPlayer.CURRENT_GE_ITEM); final int itemId = client.getVar(VarPlayer.CURRENT_GE_ITEM);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (config.enableGELimits()) if (buy && config.enableGELimits())
{ {
final ItemStats itemStats = itemManager.getItemStats(itemId, false); final ItemStats itemStats = itemManager.getItemStats(itemId, false);
@@ -823,7 +825,7 @@ public class GrandExchangePlugin extends Plugin
} }
} }
if (config.enableGELimitReset()) if (buy && config.enableGELimitReset())
{ {
Instant resetTime = getLimitResetTime(itemId); Instant resetTime = getLimitResetTime(itemId);
if (resetTime != null) if (resetTime != null)
@@ -851,7 +853,13 @@ public class GrandExchangePlugin extends Plugin
return null; return null;
} }
return shortenExamine(examine) + "<br>" + sb + "<br>" + fee; if (!fee.isEmpty())
{
sb.append("<br>").append(fee);
}
// Sell offers include an additional fee text which doesn't fit, so we truncate the examine text
return (!buy ? shortenExamine(examine) : examine) + "<br>" + sb;
} }
private static String shortenExamine(String examine) private static String shortenExamine(String examine)

2
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
View File

@@ -339,7 +339,7 @@ public class GroundItemsPlugin extends Plugin
MenuAction menuType = menuEntry.getType(); MenuAction menuType = menuEntry.getType();
if (menuType == MenuAction.GROUND_ITEM_FIRST_OPTION || menuType == MenuAction.GROUND_ITEM_SECOND_OPTION if (menuType == MenuAction.GROUND_ITEM_FIRST_OPTION || menuType == MenuAction.GROUND_ITEM_SECOND_OPTION
|| menuType == MenuAction.GROUND_ITEM_THIRD_OPTION || menuType == MenuAction.GROUND_ITEM_FOURTH_OPTION || menuType == MenuAction.GROUND_ITEM_THIRD_OPTION || menuType == MenuAction.GROUND_ITEM_FOURTH_OPTION
|| menuType == MenuAction.GROUND_ITEM_FIFTH_OPTION || menuType == MenuAction.SPELL_CAST_ON_GROUND_ITEM) || menuType == MenuAction.GROUND_ITEM_FIFTH_OPTION || menuType == MenuAction.EXAMINE_ITEM_GROUND)
{ {
for (MenuEntryWithCount entryWCount : newEntries) for (MenuEntryWithCount entryWCount : newEntries)
{ {

14
runelite-client/src/main/scripts/GeExamineInfoText.rs2asm
View File

@@ -51,8 +51,8 @@ LABEL35:
sload 0 ; examine sload 0 ; examine
sload 1 ; Convenience fee sload 1 ; Convenience fee
sload 2 ; "<$string0><br><br><$string1>" sload 2 ; "<$string0><br><br><$string1>" or "<$string0><br><$string1>"
sconst "geExamineText" sconst "geSellExamineText"
runelite_callback runelite_callback
sstore 2 ; final text sstore 2 ; final text
pop_string ; Convenience fee pop_string ; Convenience fee
@@ -157,6 +157,16 @@ LABEL35:
LABEL131: LABEL131:
sload 0 sload 0
sstore 2 sstore 2
sload 0 ; examine
sload 1 ; ""
sload 2 ; examine
sconst "geBuyExamineText"
runelite_callback
sstore 2 ; final text
pop_string ; ""
pop_string ; examine
iconst 1 iconst 1
iload 1 iload 1
if_sethide if_sethide