Skip to content

Changed 'New User' screen info (points to reddit page). #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rodgerwilco wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Changed 'New User' screen info (points to reddit page). #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb7d55e
Changed 'New User' screen info (points to reddit page).
Aug 21, 2013
9abf188
Fixes Trading
Sep 10, 2013
37abf0b
Update build.xml
Sep 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
<jar destfile="mpc-client.jar" basedir="bin">
<manifest>
<attribute name="Main-Class" value="org.moparscape.msc.client.mudclient"/>
<attribute name="Permissions" value="all-permissions"/>
<attribute name="Codebase" value="http://moparclassicclient.net78.net/"/>
</manifest>
</jar>
</target>
Expand Down
206 changes: 106 additions & 100 deletions src/org/moparscape/msc/client/mudclient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -3056,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;
Expand Down Expand Up @@ -3226,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);
}


}

Expand Down