Skip to content
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.

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

Poseidon BIG update #3468

Merged
merged 33 commits into from
Aug 7, 2021
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
a7e8991
poseidon
ya4ept Jul 11, 2021
5e208a5
poseidon
ya4ept Jul 12, 2021
9509bdf
poseidon
ya4ept Jul 12, 2021
a87c284
poseidon
ya4ept Jul 12, 2021
a597228
poseidon
ya4ept Jul 12, 2021
957b517
replaced timestamp with hh:mm:cc
ya4ept Jul 15, 2021
632ad0d
[Poseidon] update
alisonrag Jul 15, 2021
dd12140
update date of kRO ragexe in poseidon
alisonrag Jul 15, 2021
7e1d117
Add support to 0276 packet
alisonrag Jul 15, 2021
5d33010
fix header
ya4ept Jul 15, 2021
9158e69
poseidon
alisonrag Jul 15, 2021
12d73c6
poseidon use packet names
alisonrag Jul 15, 2021
96e2fb6
poseidon
alisonrag Jul 15, 2021
cafcb72
fix "0ADE" package (overweight_percent)
ya4ept Jul 15, 2021
eeff289
fix typo
alisonrag Jul 15, 2021
fa1197d
Merge branch 'poseidon' of https://github.com/OpenKore/openkore into …
alisonrag Jul 15, 2021
d44c642
poseidon
alisonrag Jul 15, 2021
626d272
change initial map
alisonrag Jul 15, 2021
e926dc0
poseidon
alisonrag Jul 16, 2021
685ab7b
Update servertypes.txt
alisonrag Jul 16, 2021
8b056b8
remove charblocksize from poseidon.txt
alisonrag Jul 16, 2021
9aa4382
replace Globals IDs value with real IDs
alisonrag Jul 16, 2021
5686134
poseidon
alisonrag Jul 16, 2021
95c8dc9
poseidon
alisonrag Jul 16, 2021
dc062bb
poseidon
alisonrag Jul 17, 2021
e21624f
poseidon
alisonrag Jul 17, 2021
f915fdd
poseidon
alisonrag Jul 17, 2021
8e6d88c
translation
ya4ept Jul 17, 2021
02e0579
fix wrong check
alisonrag Jul 18, 2021
ab3ef74
Update servertypes.txt
alisonrag Jul 18, 2021
aff3ff2
add debug in sent packets
alisonrag Jul 28, 2021
6f16fd9
added jRO support
ya4ept Jul 30, 2021
44d6747
updated major version of poseidon
ya4ept Aug 2, 2021
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: 1 addition & 1 deletion control/poseidon.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ queryserver_port=24390
# to the poseidon operate properly !
# The available server types for now are : Default, bRO_.* (check servertypes.txt)
# You should modify this if you're having problems with char list.
server_type=bRO_2016-11-08a
server_type=Default

# Char Block Size
alisonrag marked this conversation as resolved.
Show resolved Hide resolved
# Here you can specify the desired CharBlockSize your client requires
Expand Down
11 changes: 6 additions & 5 deletions src/Network/Receive.pm
Original file line number Diff line number Diff line change
Expand Up @@ -985,11 +985,11 @@ sub parse_account_server_info {
my ($self, $args) = @_;
my $server_info;

if ($args->{switch} eq '0B60') { # tRO 2020
if ($args->{switch} eq '0B60') { # tRO 2020, twRO 2021
$server_info = {
len => 164,
types => 'a4 v Z20 v3 a132',
keys => [qw(ip port name state users property ip_port)],
types => 'a4 v Z20 v3 a128 V',
keys => [qw(ip port name state users property ip_port unknown)],
};

} elsif ($args->{switch} eq '0AC4' || $args->{switch} eq '0B07') { # kRO Zero 2017, kRO ST 201703+, vRO 2021
Expand Down Expand Up @@ -1051,8 +1051,8 @@ sub reconstruct_account_server_info {
if ($args->{switch} eq '0B60') { # tRO 2020
$serverInfo = {
len => 164,
types => 'a4 v Z20 v3 a132',
keys => [qw(ip port name state users property ip_port)],
types => 'a4 v Z20 v3 a128 V',
keys => [qw(ip port name state users property ip_port unknown)],
};

} elsif ($args->{switch} eq "0AC4" || $self->{packet_lut}{$args->{switch}} eq "0AC4" || $args->{switch} eq '0B07') {
Expand Down Expand Up @@ -9031,6 +9031,7 @@ sub skill_update {
#TODO !
sub overweight_percent {
my ($self, $args) = @_;
debug "Received overweight percent: $args->{percent}\n";
}

sub partylv_info {
Expand Down
2 changes: 1 addition & 1 deletion src/Network/Receive/ServerType0.pm
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ sub new {
'0ACD' => ['login_error', 'C Z20', [qw(type date)]],
'0ADA' => ['refine_status', 'Z24 V C C', [qw(name itemID refine_level status)]],
'0ADC' => ['misc_config', 'C4', [qw(show_eq_flag call_flag pet_autofeed_flag homunculus_autofeed_flag)]],
'0ADE' => ['overweight_percent', 'v V', [qw(len percent)]],#TODO
'0ADE' => ['overweight_percent', 'V', [qw(percent)]],# 6 TODO
'0ADF' => ['actor_info', 'a4 a4 Z24 Z24', [qw(ID charID name prefix_name)]],
'0ADD' => ['item_appeared', 'a4 v2 C v2 C2 v C v', [qw(ID nameID type identified x y subx suby amount show_effect effect_type )]],
'0AE0' => ['login_error', 'V V Z20', [qw(type error date)]],
Expand Down
2 changes: 1 addition & 1 deletion src/Network/Receive/kRO/Sakexe_0.pm
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ sub new {
'0ADA' => ['refine_status', 'Z24 V C C', [qw(name itemID refine_level status)]],
'0ADC' => ['misc_config', 'C4', [qw(show_eq_flag call_flag pet_autofeed_flag homunculus_autofeed_flag)]],
'0ADD' => ['item_appeared', 'a4 v2 C v2 C2 v C v', [qw(ID nameID type identified x y subx suby amount show_effect effect_type )]],
'0ADE' => ['overweight_percent', 'v V', [qw(len percent)]],#TODO
'0ADE' => ['overweight_percent', 'V', [qw(percent)]],# 6 TODO
'0ADF' => ['actor_info', 'a4 a4 Z24 Z24', [qw(ID charID name prefix_name)]],
'0AE0' => ['login_error', 'V V Z20', [qw(type error date)]],
'0AE2' => ['open_ui', 'C V', [qw(type data)]],
Expand Down
3 changes: 2 additions & 1 deletion src/Poseidon/QueryServer.pm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use Poseidon::Config;
use base qw(Base::Server);
use Plugins;
use Misc;
use Utils qw (getFormattedDateShort);

my $CLASS = "Poseidon::QueryServer";

Expand Down Expand Up @@ -141,7 +142,7 @@ sub iterate {
shift @{$queue};

} elsif (@{$queue} > 0 && $server->getState() eq 'ready') {
print "[PoseidonServer]-> Querying Ragnarok Online client [" . time . "]...\n";
print "[PoseidonServer]-> Querying Ragnarok Online client [" . getFormattedDateShort(time, 1) . "]...\n";
$server->query($queue->[0]{packet});
}
}
Expand Down
Loading