From 48e73139d3777c4bd683f4a9c8c1d93a4c4ac60c Mon Sep 17 00:00:00 2001 From: pifreak Date: Sat, 16 Mar 2019 14:53:21 -0500 Subject: [PATCH 1/4] almost fixed parties, still a little funky. --- StickKnightsOnline-Client/.vscode/launch.json | 27 ++++++++++++++++++ StickKnightsOnline-Client/DAT/config.ini | 2 +- StickKnightsOnline-Client/DAT/options.dat | Bin 4 -> 4 bytes StickKnightsOnline-Client/SKO_Network.cpp | 4 +-- StickKnightsOnline-Client/main.cpp | 1 - StickKnightsOnline-Client/operating_system.h | 6 ++-- 6 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 StickKnightsOnline-Client/.vscode/launch.json diff --git a/StickKnightsOnline-Client/.vscode/launch.json b/StickKnightsOnline-Client/.vscode/launch.json new file mode 100644 index 0000000..447c34b --- /dev/null +++ b/StickKnightsOnline-Client/.vscode/launch.json @@ -0,0 +1,27 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "(gdb) Launch", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/Stick-Knights-Online", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + } + ] +} \ No newline at end of file diff --git a/StickKnightsOnline-Client/DAT/config.ini b/StickKnightsOnline-Client/DAT/config.ini index 8bff290..e53e902 100644 --- a/StickKnightsOnline-Client/DAT/config.ini +++ b/StickKnightsOnline-Client/DAT/config.ini @@ -3,7 +3,7 @@ [server] -hostname = optimuspi.us ; server i.p. or hostname +hostname = localhost ; server i.p. or hostname port = 1338 ; server port, 1337==prod 1338==dev [graphics] diff --git a/StickKnightsOnline-Client/DAT/options.dat b/StickKnightsOnline-Client/DAT/options.dat index 9cb1bca78753ed36d04226e3d180aca2987130bb..cf2df0f22416b4e9a7b3b20d5af4a6c7233b9379 100644 GIT binary patch literal 4 LcmZQzWMlvU00{sC literal 4 LcmZQ%WMl*Y01f~J diff --git a/StickKnightsOnline-Client/SKO_Network.cpp b/StickKnightsOnline-Client/SKO_Network.cpp index 060dd80..fd64ac5 100644 --- a/StickKnightsOnline-Client/SKO_Network.cpp +++ b/StickKnightsOnline-Client/SKO_Network.cpp @@ -174,7 +174,7 @@ void SKO_Network::sendPartyInvite(unsigned char playerId) void SKO_Network::acceptPartyInvite() { - send(TRADE, ACCEPT); + send(PARTY, ACCEPT); } void SKO_Network::cancelParty() @@ -1575,9 +1575,9 @@ void SKO_Network::receivePacket(bool connectErr) { case INVITE: + printf("Trade invite..\n"); playerB = socket->Data[3]; - ss << "Trade with "; ss << Player[playerB].Nick; ss << "?"; diff --git a/StickKnightsOnline-Client/main.cpp b/StickKnightsOnline-Client/main.cpp index 1251300..fec0530 100644 --- a/StickKnightsOnline-Client/main.cpp +++ b/StickKnightsOnline-Client/main.cpp @@ -6190,7 +6190,6 @@ void physics() { if (Player[MyID].party >= 0 && Player[pp].party == Player[MyID].party) { - printf("Player party is: %i\n", Player[MyID].party); Player[MyID].nametag.R = 0.2; Player[MyID].nametag.G = 0.9; Player[MyID].nametag.B = 0.2; diff --git a/StickKnightsOnline-Client/operating_system.h b/StickKnightsOnline-Client/operating_system.h index 5d3375c..0bb4d43 100644 --- a/StickKnightsOnline-Client/operating_system.h +++ b/StickKnightsOnline-Client/operating_system.h @@ -3,11 +3,11 @@ #define _OPERATING_SYSTEM_H__ //Make this match OS version -#define MY_OS 1 +#define MY_OS 2 //Keep int value the same -#define WINDOWS_OS 1 -//#define LINUX_OS 2 +//#define WINDOWS_OS 1 +#define LINUX_OS 2 //#define MAC_OS 3 #endif From bd71cd789b6c4bae67d0892590ff88518f895a38 Mon Sep 17 00:00:00 2001 From: pifreak Date: Sun, 17 Mar 2019 21:18:19 -0500 Subject: [PATCH 2/4] Fixed cosmetic where green text did not show up for parties correctly for all members. --- StickKnightsOnline-Client/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/StickKnightsOnline-Client/main.cpp b/StickKnightsOnline-Client/main.cpp index fec0530..736d832 100644 --- a/StickKnightsOnline-Client/main.cpp +++ b/StickKnightsOnline-Client/main.cpp @@ -6190,9 +6190,9 @@ void physics() { if (Player[MyID].party >= 0 && Player[pp].party == Player[MyID].party) { - Player[MyID].nametag.R = 0.2; - Player[MyID].nametag.G = 0.9; - Player[MyID].nametag.B = 0.2; + Player[pp].nametag.R = 0.2; + Player[pp].nametag.G = 0.9; + Player[pp].nametag.B = 0.2; if (MyID != pp) { @@ -6273,9 +6273,9 @@ void physics() } else //(not in party) { - Player[MyID].nametag.R = 1; - Player[MyID].nametag.G = 1; - Player[MyID].nametag.B = 1; + Player[pp].nametag.R = 1; + Player[pp].nametag.G = 1; + Player[pp].nametag.B = 1; } }//end ident } From d6a3d9c2c724a069a9acb25838c325868b4e42c6 Mon Sep 17 00:00:00 2001 From: pifreak Date: Sun, 24 Mar 2019 18:44:07 -0500 Subject: [PATCH 3/4] fixed items for sale map 3 --- .gitignore | 1 + StickKnightsOnline-Client/MAP/map3.ini | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 1744967..a481fca 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ StickKnightsOnline.VC.db StickKnightsOnline-Client/patch_windows.zip StickKnightsOnline-Client/Stick-Knights-Online StickKnightsOnline-Client/Stick-Knights-Online +*.bin diff --git a/StickKnightsOnline-Client/MAP/map3.ini b/StickKnightsOnline-Client/MAP/map3.ini index 0cea9db..d6742f1 100644 --- a/StickKnightsOnline-Client/MAP/map3.ini +++ b/StickKnightsOnline-Client/MAP/map3.ini @@ -36,20 +36,20 @@ h = 120 item_x0_y0 = 35 ; guard helmet price_x0_y0 = 90000 -item_x2_y1 = 22 ; gold sword -price_x2_y1 = 9500 -item_x3_y1 = 23 ; crystal sword -price_x3_y1 = 140000 +item_x0_y1 = 22 ; gold sword +price_x0_y1 = 9500 +item_x1_y1 = 23 ; crystal sword +price_x1_y1 = 140000 -item_x2_y2 = 26 ; gold axe -price_x2_y2 = 9500 -item_x3_y2 = 27 ; crystal axe -price_x3_y2 = 140000 +item_x0_y2 = 26 ; gold axe +price_x0_y2 = 9500 +item_x1_y2 = 27 ; crystal axe +price_x1_y2 = 140000 -item_x2_y3 = 30 ; gold hammer -price_x2_y3 = 9500 -item_x3_y3 = 31 ; cystal hammer -price_x3_y3 = 140000 +item_x0_y3 = 30 ; gold hammer +price_x0_y3 = 9500 +item_x1_y3 = 31 ; cystal hammer +price_x1_y3 = 140000 [enemy0] sprite = skeletonguard From 9cd2ef488f37e273a853f5fe023e037fdfe2891e Mon Sep 17 00:00:00 2001 From: pifreak Date: Wed, 27 Mar 2019 20:16:22 -0500 Subject: [PATCH 4/4] bug fix and up patch # --- StickKnightsOnline-Client/MAP/map5.ini | 8 +++++++ StickKnightsOnline-Client/SKO_PacketTypes.h | 2 +- StickKnightsOnline-Client/main.cpp | 26 ++++++++++----------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/StickKnightsOnline-Client/MAP/map5.ini b/StickKnightsOnline-Client/MAP/map5.ini index f6fb288..162a9e6 100644 --- a/StickKnightsOnline-Client/MAP/map5.ini +++ b/StickKnightsOnline-Client/MAP/map5.ini @@ -4,6 +4,14 @@ [count] enemies = 10 +targets = 1 + +[target0] +x = 640 +y = 288 +w = 32 +h = 32 +sprite = 1 [enemy0] sprite = skeletonhaunted diff --git a/StickKnightsOnline-Client/SKO_PacketTypes.h b/StickKnightsOnline-Client/SKO_PacketTypes.h index 40ee8d4..bb3237d 100644 --- a/StickKnightsOnline-Client/SKO_PacketTypes.h +++ b/StickKnightsOnline-Client/SKO_PacketTypes.h @@ -13,7 +13,7 @@ DISCONNECT = 251, VERSION_MAJOR = 1, VERSION_MINOR = 3, -VERSION_PATCH = 0, +VERSION_PATCH = 1, VERSION_OS = MY_OS, PING = 0, diff --git a/StickKnightsOnline-Client/main.cpp b/StickKnightsOnline-Client/main.cpp index 736d832..1f0c427 100644 --- a/StickKnightsOnline-Client/main.cpp +++ b/StickKnightsOnline-Client/main.cpp @@ -5345,23 +5345,23 @@ int main(int argc, char *argv[]) Item[ITEM_ICECREAM] = SKO_Item(9, 16, 0, "Icecream Cone"); Item[ITEM_SUNGLASSES] = SKO_Item(21, 13, 0, "Sunglasses"); - Item[ITEM_SWORD_RUSTED] = SKO_Item(11, 32, 250, "Rusty Sword", 0, 2, 2); - Item[ITEM_SWORD_STEEL] = SKO_Item(11, 32, 8000, "Steel Sword", 0, 4, 4); - Item[ITEM_SWORD_GOLD] = SKO_Item(11, 32, 40000, "Golden Sword", 0, 8, 8); - Item[ITEM_SWORD_CRYSTAL] = SKO_Item(11, 32, 120000, "Crystal Sword", 1, 16, 16); + Item[ITEM_SWORD_RUSTED] = SKO_Item(11, 32, 25, "Rusty Sword", 0, 2, 2); + Item[ITEM_SWORD_STEEL] = SKO_Item(11, 32, 90, "Steel Sword", 0, 4, 4); + Item[ITEM_SWORD_GOLD] = SKO_Item(11, 32, 6000, "Golden Sword", 0, 8, 8); + Item[ITEM_SWORD_CRYSTAL] = SKO_Item(11, 32, 80000, "Crystal Sword", 1, 16, 16); - Item[ITEM_AXE_RUSTED] = SKO_Item(12, 31, 250, "Rusty Hatchet", 0, 1, 3); - Item[ITEM_AXE_STEEL] = SKO_Item(12, 31, 8000, "Steel Hatchet", 0, 3, 5); - Item[ITEM_AXE_GOLD] = SKO_Item(21, 32, 40000, "Golden Axe", 0, 6, 10); - Item[ITEM_AXE_CRYSTAL] = SKO_Item(24, 32, 120000, "Crystal Axe", 1, 14, 18); + Item[ITEM_AXE_RUSTED] = SKO_Item(12, 31, 25, "Rusty Hatchet", 0, 1, 3); + Item[ITEM_AXE_STEEL] = SKO_Item(12, 31, 90, "Steel Hatchet", 0, 3, 5); + Item[ITEM_AXE_GOLD] = SKO_Item(21, 32, 6000, "Golden Axe", 0, 6, 10); + Item[ITEM_AXE_CRYSTAL] = SKO_Item(24, 32, 80000, "Crystal Axe", 1, 14, 18); - Item[ITEM_HAMMER_RUSTED] = SKO_Item(17, 32, 250, "Rusty Hammer", 0, 3, 1); - Item[ITEM_HAMMER_STEEL] = SKO_Item(17, 32, 8000, "Steel Hammer", 0, 5, 3); - Item[ITEM_HAMMER_GOLD] = SKO_Item(17, 32, 40000, "Golden Hammer", 0, 10, 6); - Item[ITEM_HAMMER_CRYSTAL] = SKO_Item(29, 32, 120000, "Crystal Hammer", 1, 18, 14); + Item[ITEM_HAMMER_RUSTED] = SKO_Item(17, 32, 25, "Rusty Hammer", 0, 3, 1); + Item[ITEM_HAMMER_STEEL] = SKO_Item(17, 32, 90, "Steel Hammer", 0, 5, 3); + Item[ITEM_HAMMER_GOLD] = SKO_Item(17, 32, 6000, "Golden Hammer", 0, 10, 6); + Item[ITEM_HAMMER_CRYSTAL] = SKO_Item(29, 32, 80000, "Crystal Hammer", 1, 18, 14); Item[ITEM_SCYTHE] = SKO_Item(23, 25, 900, "Scythe", 0, 3, 3); - Item[ITEM_SCYTHE_REAPER] = SKO_Item(27, 32, 15, "Reaper's Scythe", 10, 10, 10); + Item[ITEM_SCYTHE_REAPER] = SKO_Item(27, 32, 18000, "Reaper's Scythe", 10, 10, 10); Item[ITEM_HALLOWEEN_MASK] = SKO_Item(18, 21, 0, "Halloween Mask"); Item[ITEM_GUARD_HELM] = SKO_Item(18, 21, 2500, "Guard Helmet", 10, 1, 5); Item[ITEM_JACK_OLANTERN] = SKO_Item(21, 23, 0, "Jack O' Lantern");