Use custom script to join cc, so 437 is still there for minigames

This commit is contained in:
Lucas
2019-05-21 05:12:57 +02:00
parent 3d88a00839
commit da321c5983
5 changed files with 46 additions and 18 deletions

View File

@@ -96,11 +96,7 @@ public final class ScriptID
public static final int CHAT_PROMPT_INIT = 223;
/**
* Joins a clan chat
* <ul>
* <li>string Name of player's clan chat to join</li>
* </ul>
*
* Joins the corresponding minigame chat
*/
public static final int FORCE_JOIN_CC = 437;
@@ -175,4 +171,10 @@ public final class ScriptID
* </ul>
*/
public static final int XPDROP_DISABLED = 2091;
/**
* Join a clan, duh
*/
public static final int CUSTOM_JOIN_CLAN = 10690;
}

View File

@@ -568,7 +568,7 @@ public class ClanChatPlugin extends Plugin
widget.setTextShadowed(true);
widget.setBorderType(1);
widget.setAction(0, "Join");
widget.setOnOpListener(ScriptID.FORCE_JOIN_CC, widget.getText());
widget.setOnOpListener(ScriptID.CUSTOM_JOIN_CLAN, widget.getText());
widget.setOriginalHeight(14);
widget.setOriginalWidth(142);
widget.setOriginalY(y);

View File

@@ -1 +0,0 @@
3A111DACE3611F4C4FB53F60FC180F863D5FC222D24EE301B08D49496658F802

View File

@@ -1,11 +0,0 @@
.id 437
.int_stack_count 1
.string_stack_count 0
.int_var_count 1
.string_var_count 1
sload 0
clan_joinchat
sconst "joinCC"
runelite_callback
return

View File

@@ -0,0 +1,38 @@
;;;
;
; Copyright (c) 2019, Lucas <https://github.com/Lucwousin>
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
; modification, are permitted provided that the following conditions are met:
;
; 1. Redistributions of source code must retain the above copyright notice, this
; list of conditions and the following disclaimer.
; 2. Redistributions in binary form must reproduce the above copyright notice,
; this list of conditions and the following disclaimer in the documentation
; and/or other materials provided with the distribution.
;
; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
;
;;;;;;;;;;;;;;;
; ;
; Join a cc ;
; ;
;;;;;;;;;;;;;;;
.id 10690
.int_stack_count 0
.string_stack_count 1
.int_var_count 0
.string_var_count 1
sload 0
clan_joinchat
return