From cb7d55e132191a000bae568abc7768af86185fc4 Mon Sep 17 00:00:00 2001 From: Rodgerwilco Date: Tue, 20 Aug 2013 21:07:02 -0700 Subject: [PATCH 1/3] Changed 'New User' screen info (points to reddit page). --- src/org/moparscape/msc/client/mudclient.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/org/moparscape/msc/client/mudclient.java b/src/org/moparscape/msc/client/mudclient.java index 814c21d..6816444 100644 --- a/src/org/moparscape/msc/client/mudclient.java +++ b/src/org/moparscape/msc/client/mudclient.java @@ -2355,18 +2355,20 @@ private final void createLoginMenus() { loginButtonNewUser = loginMenuFirst.createButton(156, 240 + l, 120, 35); loginMenuLoginButton = loginMenuFirst.createButton(356, 240 + l, 120, 35); } else { - loginMenuFirst.drawText(256, 200 + l, "Welcome to RuneScape", 4, true); + loginMenuFirst.drawText(256, 200 + l, "Welcome to MoparClassic", 4, true); loginMenuFirst.drawText(256, 215 + l, "You need a member account to use this server", 4, true); loginMenuFirst.drawButton(256, 250 + l, 200, 35); loginMenuFirst.drawText(256, 250 + l, "Click here to login", 5, false); loginMenuLoginButton = loginMenuFirst.createButton(256, 250 + l, 200, 35); } loginNewUser = new Menu(gameGraphics, 50); - l = 230; - loginNewUser.drawText(256, l + 8, "To create an account please go back to the", 4, true); + l = 220; + loginNewUser.drawText(256, l + 8, "To create an account please visit ", 4, true); l += 20; - loginNewUser.drawText(256, l + 8, "www.runescape.com front page, and choose 'create account'", 4, true); - l += 30; + loginNewUser.drawText(256, l + 8, "http://www.reddit.com/r/moparclassic/", 4, true); + l += 20; + loginNewUser.drawText(256, l + 8, "and read the sticky, 'creating accounts'.", 4, true); + l += 22; loginNewUser.drawButton(256, l + 17, 150, 34); loginNewUser.drawText(256, l + 17, "Ok", 5, false); loginMenuOkButton = loginNewUser.createButton(256, l + 17, 150, 34); @@ -2622,7 +2624,7 @@ private final void drawWelcomeBox() { gameGraphics.drawBox(56, 167 - l / 2, 400, l, 0); gameGraphics.drawBoxEdge(56, 167 - l / 2, 400, l, 0xffffff); i1 += 20; - gameGraphics.drawText("Welcome to RuneScape " + loginUsername, 256, i1, 4, 0xffff00); + gameGraphics.drawText("Welcome to MoparClassic " + loginUsername, 256, i1, 4, 0xffff00); i1 += 30; String s1; // lastLoginDays subDaysLeft lastLoginAddress From 9abf1883509a2a3e0567d89f3df3635441e62844 Mon Sep 17 00:00:00 2001 From: Rodgerwilco Date: Tue, 10 Sep 2013 11:32:29 -0700 Subject: [PATCH 2/3] Fixes Trading --- src/org/moparscape/msc/client/mudclient.java | 192 ++++++++++--------- 1 file changed, 98 insertions(+), 94 deletions(-) diff --git a/src/org/moparscape/msc/client/mudclient.java b/src/org/moparscape/msc/client/mudclient.java index 6816444..98ac8da 100644 --- a/src/org/moparscape/msc/client/mudclient.java +++ b/src/org/moparscape/msc/client/mudclient.java @@ -3058,100 +3058,103 @@ private final void drawCombatStyleBox() { gameGraphics.drawText("Defensive (+3 defense)", byte0 + c1 / 2, byte1 + 96, 3, 0); } - private final void drawTradeBox() { - if(mouseButtonClick != 0) { - int mx = super.mouseX - 22; - int my = super.mouseY - 36; - if(mx >= 0 && my >= 30 && mx < 462 && my < 262) { - if(mx > 216 && my > 30 && mx < 462 && my < 235) { - int curItem = (mx - 217) / 49 + ((my - 31) / 34) * 5; - if(curItem >= 0 && curItem < inventoryItemsCount) { - int item = inventoryItems[curItem]; - mouseClickedHeldInTradeDuelBox = 1; - boolean ourTradeItemsChanged = false; - int someInt = 0; - for(int tradeItem = 0; tradeItem < tradeItemsOurCount; tradeItem++) - if(tradeItemsOur[tradeItem] == item) - if(Data.itemStackable[item] == 0) - for(int i = 0; i < mouseClickedHeldInTradeDuelBox; i++) { - if(tradeItemOurCount[tradeItem] < inventoryItemCount[curItem]) - tradeItemOurCount[tradeItem]++; - ourTradeItemsChanged = true; - } - else - someInt++; - if(getInventoryItemTotalCount(item) <= someInt) - ourTradeItemsChanged = true; - if(Data.itemSpecial[item] == 1) { - displayMessage("This object cannot be traded with other players", 3); - ourTradeItemsChanged = true; - } - if(!ourTradeItemsChanged && tradeItemsOurCount < 12) { - tradeItemsOur[tradeItemsOurCount] = item; - tradeItemOurCount[tradeItemsOurCount] = 1; - tradeItemsOurCount++; - ourTradeItemsChanged = true; - } - if(ourTradeItemsChanged) { - super.streamClass.createPacket(70); - super.streamClass.addByte(tradeItemsOurCount); - for(int i = 0; i < tradeItemsOurCount; i++) { - super.streamClass.addShort(tradeItemsOur[i]); - super.streamClass.addInt(tradeItemOurCount[i]); - } - super.streamClass.formatPacket(); - tradeOtherAccepted = false; - tradeWeAccepted = false; - } - } - } - else if(mx > 8 && my > 30 && mx < 205 && my < 133) { - int curItem = (mx - 9) / 49 + ((my - 31) / 34) * 4; - if(curItem >= 0 && curItem < tradeItemsOurCount) { - int item = tradeItemsOur[curItem]; - for(int i = 0; i < mouseClickedHeldInTradeDuelBox; i++) { - if(Data.itemStackable[item] == 0 && tradeItemOurCount[curItem] > 1) { - tradeItemOurCount[curItem]--; - continue; - } - tradeItemsOurCount--; - mouseButtonHeldTime = 0; - for(int j = curItem; j < tradeItemsOurCount; j++) { - tradeItemsOur[j] = tradeItemsOur[j + 1]; - tradeItemOurCount[j] = tradeItemOurCount[j + 1]; - } - break; - } - super.streamClass.createPacket(70); - super.streamClass.addByte(tradeItemsOurCount); - for(int i = 0; i < tradeItemsOurCount; i++) { - super.streamClass.addShort(tradeItemsOur[i]); - super.streamClass.addInt(tradeItemOurCount[i]); - } - super.streamClass.formatPacket(); - tradeOtherAccepted = false; - tradeWeAccepted = false; - } - } - if(mx >= 217 && my >= 238 && mx <= 286 && my <= 259) { - tradeWeAccepted = true; - super.streamClass.createPacket(211); - super.streamClass.formatPacket(); - } - if(mx >= 394 && my >= 238 && mx < 463 && my < 259) { - showTradeBox = false; - super.streamClass.createPacket(216); - super.streamClass.formatPacket(); - } - } - else { - showTradeBox = false; - super.streamClass.createPacket(216); - super.streamClass.formatPacket(); - } - mouseButtonClick = 0; - mouseClickedHeldInTradeDuelBox = 0; - } + private final void drawTradeBox() { + if(mouseButtonClick != 0 && mouseClickedHeldInTradeDuelBox == 0) + mouseClickedHeldInTradeDuelBox = 1; + + int mx = super.mouseX - 22; + int my = super.mouseY - 36; + if (mouseClickedHeldInTradeDuelBox > 0) { + if(mx >= 0 && my >= 30 && mx < 462 && my < 262) { + if(mx > 216 && my > 30 && mx < 462 && my < 235) { + int curItem = (mx - 217) / 49 + ((my - 31) / 34) * 5; + if(curItem >= 0 && curItem < inventoryItemsCount) { + int item = inventoryItems[curItem]; + boolean ourTradeItemsChanged = false; + int someInt = 0; + for(int tradeItem = 0; tradeItem < tradeItemsOurCount; tradeItem++) + if(tradeItemsOur[tradeItem] == item) + if(Data.itemStackable[item] == 0) + for(int i = 0; i < mouseClickedHeldInTradeDuelBox; i++) { + if(tradeItemOurCount[tradeItem] < inventoryItemCount[curItem]) + tradeItemOurCount[tradeItem]++; + ourTradeItemsChanged = true; + } + else + someInt++; + if(getInventoryItemTotalCount(item) <= someInt) + ourTradeItemsChanged = true; + if(Data.itemSpecial[item] == 1) { + displayMessage("This object cannot be traded with other players", 3); + ourTradeItemsChanged = true; + } + if(!ourTradeItemsChanged && tradeItemsOurCount < 12) { + tradeItemsOur[tradeItemsOurCount] = item; + tradeItemOurCount[tradeItemsOurCount] = 1; + tradeItemsOurCount++; + ourTradeItemsChanged = true; + } + if(ourTradeItemsChanged) { + super.streamClass.createPacket(70); + super.streamClass.addByte(tradeItemsOurCount); + for(int i = 0; i < tradeItemsOurCount; i++) { + super.streamClass.addShort(tradeItemsOur[i]); + super.streamClass.addInt(tradeItemOurCount[i]); + } + super.streamClass.formatPacket(); + tradeOtherAccepted = false; + tradeWeAccepted = false; + } + } + } + if(mx > 8 && my > 30 && mx < 205 && my < 133) { + int curItem = (mx - 9) / 49 + ((my - 31) / 34) * 4; + if(curItem >= 0 && curItem < tradeItemsOurCount) { + int item = tradeItemsOur[curItem]; + for(int i = 0; i < mouseClickedHeldInTradeDuelBox; i++) { + if(Data.itemStackable[item] == 0 && tradeItemOurCount[curItem] > 1) { + tradeItemOurCount[curItem]--; + continue; + } + tradeItemsOurCount--; + mouseButtonHeldTime = 0; + for(int j = curItem; j < tradeItemsOurCount; j++) { + tradeItemsOur[j] = tradeItemsOur[j + 1]; + tradeItemOurCount[j] = tradeItemOurCount[j + 1]; + } + break; + } + super.streamClass.createPacket(70); + super.streamClass.addByte(tradeItemsOurCount); + for(int i = 0; i < tradeItemsOurCount; i++) { + super.streamClass.addShort(tradeItemsOur[i]); + super.streamClass.addInt(tradeItemOurCount[i]); + } + super.streamClass.formatPacket(); + tradeOtherAccepted = false; + tradeWeAccepted = false; + } + } + if(mx >= 217 && my >= 238 && mx <= 286 && my <= 259) { + tradeWeAccepted = true; + super.streamClass.createPacket(211); + super.streamClass.formatPacket(); + } + if(mx >= 394 && my >= 238 && mx < 463 && my < 259) { + showTradeBox = false; + super.streamClass.createPacket(216); + super.streamClass.formatPacket(); + } + } + else { + showTradeBox = false; + super.streamClass.createPacket(216); + super.streamClass.formatPacket(); + } + mouseButtonClick = 0; + mouseClickedHeldInTradeDuelBox = 0; + } + if(!showTradeBox) return; byte byte0 = 22; @@ -3228,6 +3231,7 @@ else if(mx > 8 && my > 30 && mx < 205 && my < 133) { if(super.mouseX > j7 && super.mouseX < j7 + 48 && super.mouseY > k7 && super.mouseY < k7 + 32) gameGraphics.drawString(Data.itemName[tradeItemsOther[l6]] + ": @whi@" + Data.itemDescription[tradeItemsOther[l6]], byte0 + 8, byte1 + 273, 1, 0xffff00); } + } From 37abf0b53892c50bddb9e00dd6013bbc4f151083 Mon Sep 17 00:00:00 2001 From: Rodgerwilco Date: Tue, 10 Sep 2013 11:34:34 -0700 Subject: [PATCH 3/3] Update build.xml --- build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.xml b/build.xml index fbe0763..5e4e11e 100644 --- a/build.xml +++ b/build.xml @@ -37,6 +37,8 @@ + +