Skip to content

Commit

Permalink
Sync.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lead0b110010100 authored and Lead0b110010100 committed May 6, 2020
1 parent 71f14db commit a04c67f
Show file tree
Hide file tree
Showing 10 changed files with 1,454 additions and 870 deletions.
1,142 changes: 571 additions & 571 deletions main/srv1/share/locale/germany/locale_string.txt
View file

Large diffs are not rendered by default.

27 changes: 18 additions & 9 deletions main/srv1/share/locale/germany/map/metin2_map_a1/npc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ m 644 551 0 0 0 1 1m 100 1 20304
m 647 550 0 0 0 1 1m 100 1 20305
m 651 549 0 0 0 1 1m 100 1 20306
m 654 548 0 0 0 1 1m 100 1 20307
m 670 549 0 0 0 8 1m 100 1 20091
// ��������--------------------------------------------------------------------------
m 596 557 0 0 0 1 1m 100 1 9001
//m 595 557 0 0 0 1 1m 100 1 9007
Expand All @@ -17,8 +16,11 @@ m 596 605 0 0 0 5 1m 100 1 9002
m 678 565 0 0 0 8 1m 100 1 9003
m 674 607 0 0 0 6 1m 100 1 9005
m 633 622 0 0 0 2 1m 100 1 9006
m 626 632 0 0 0 5 1m 100 1 20095
m 672 556 0 0 0 8 1m 100 1 20016
m 691 570 0 0 0 2 1m 100 1 20381
m 683 574 0 0 0 8 1m 100 1 20091
m 598 557 0 0 0 1 1m 100 1 20092
m 672 610 0 0 0 6 1m 100 1 9010
// ��ε�----------------------------------------------------------------------------
m 354 327 0 0 0 0 1m 100 1 9009
m 325 405 0 0 0 0 1m 100 1 9009
Expand All @@ -40,9 +42,8 @@ m 698 513 1 1 0 0 1m 100 1 20003
m 597 511 1 1 0 0 1m 100 1 20005
m 582 578 1 1 0 0 1m 100 1 20006
m 713 605 1 1 0 0 1m 100 1 20011
m 695 657 1 1 0 0 1m 100 1 20018
m 895 618 1 1 0 6 1m 100 1 20018
g 714 566 1 1 0 0 1m 100 1 12007
m 599 605 1 1 0 0 1s 100 1 9008
// ���� -----------------------------------------------------------------------------------
m 405 73 0 0 0 0 1m 100 1 10001
// ���� NPC
Expand All @@ -61,12 +62,22 @@ m 573 531 0 0 0 0 1m 100 1 20355
m 605 663 0 0 0 0 1m 100 1 20354
m 60 1118 0 0 0 0 1m 100 1 20358
m 582 347 0 0 0 0 1m 100 1 20357
m 896 610 0 0 0 0 1m 100 1 20084
m 896 610 0 0 0 6 1m 100 1 20084
// �̺�Ʈ�� NPC
m 545 397 0 0 0 0 1m 100 1 20086
m 545 412 0 0 0 0 1m 100 1 20087
m 578 470 0 0 0 0 1m 100 1 20090

// over9����NPC
m 676 604 0 0 0 6 1m 100 1 20094

// Ponys und Pferde
m 712 563 0 0 0 0 1m 100 1 20029
m 717 564 0 0 0 0 1m 100 1 20029
m 715 568 0 0 0 0 1m 100 1 20029
m 711 569 0 0 0 0 1m 100 1 20030
m 714 566 0 0 0 0 1m 100 1 20030

// Damage Puppen
m 589 669 0 0 0 4 5s 100 1 50500
m 584 662 0 0 0 4 5s 100 1 50501
Expand All @@ -75,7 +86,5 @@ m 572 654 0 0 0 4 5s 100 1 50503
m 566 652 0 0 0 5 5s 100 1 50504
m 558 650 0 0 0 5 5s 100 1 50505

// over9����NPC
m 656 646 0 0 0 0 1m 100 1 20094

m 640 663 0 0 0 3 1m 100 1 20001
// Event NPC
m 617 647 0 0 0 0 1s 100 1 801
29 changes: 19 additions & 10 deletions main/srv1/share/locale/germany/map/metin2_map_b1/npc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ m 676 617 0 0 0 7 1m 100 1 9002
m 590 689 0 0 0 4 1m 100 1 9003
m 609 596 0 0 0 2 1m 100 1 9005
m 588 633 0 0 0 1 1m 100 1 9006
m 586 620 0 0 0 1 1m 100 1 20095
m 594 692 0 0 0 4 1m 100 1 20016
m 571 688 0 0 0 6 1m 100 1 20381
m 590 707 0 0 0 3 1s 100 1 20091
m 586 684 0 0 0 4 1m 100 1 20091
m 674 664 0 0 0 6 1m 100 1 20092
m 612 593 0 0 0 2 1m 100 1 9010
// ��ε�----------------------------------------------------------------------------
m 675 539 0 0 0 0 1m 100 1 9009
m 742 879 0 0 0 0 1m 100 1 9009
Expand All @@ -38,14 +40,13 @@ m 553 663 1 1 0 0 1m 100 1 20003
m 702 686 1 1 0 0 1m 100 1 20005
m 717 633 1 1 0 0 1m 100 1 20006
m 655 553 1 1 0 0 1m 100 1 20011
m 674 590 1 1 0 0 1m 100 1 20018
m 870 804 1 1 0 6 1m 100 1 20018
g 533 599 1 1 0 0 1m 100 1 12007
m 672 612 1 1 0 0 1s 100 1 9008
// ����-----------------------------------------------------------------------------------
m 876 1127 0 0 0 0 1m 100 1 10003
// ������ npc
m 908 87 0 0 0 0 1m 100 1 20009
m 519 512 0 0 0 0 1m 100 1 9012
m 519 512 0 0 0 3 1m 100 1 9012
//m 614 116 0 0 0 3 1m 100 1 10085

// ���
Expand All @@ -62,12 +63,22 @@ m 772 682 0 0 0 0 1m 100 1 20355
m 571 558 0 0 0 0 1m 100 1 20354
m 250 1104 0 0 0 0 1m 100 1 20358
m 614 1167 0 0 0 0 1m 100 1 20357
m 898 797 0 0 0 0 1m 100 1 20084
m 899 798 0 0 0 6 1m 100 1 20084
// �̺�Ʈ�� NPC
m 864 823 0 0 0 0 1m 100 1 20086
m 854 827 0 0 0 0 1m 100 1 20087
m 538 784 0 0 0 0 1m 100 1 20090

// over9���� NPC
m 605 598 0 0 0 2 1m 100 1 20094

// Ponys und Pferde
m 527 610 0 0 0 0 1m 100 1 20029
m 526 603 0 0 0 0 1m 100 1 20029
m 532 597 0 0 0 0 1m 100 1 20029
m 535 601 0 0 0 0 1m 100 1 20030
m 538 611 0 0 0 0 1m 100 1 20030

// Damage Puppen
m 572 555 0 0 0 7 5s 100 1 50500
m 570 562 0 0 0 7 5s 100 1 50501
Expand All @@ -76,7 +87,5 @@ m 540 565 0 0 0 5 5s 100 1 50503
m 534 561 0 0 0 4 5s 100 1 50504
m 530 554 0 0 0 3 5s 100 1 50505

// over9���� NPC
m 657 686 0 0 0 0 1m 100 1 20094

m 615 564 0 0 0 3 1m 100 1 20001
// Event NPC
m 580 605 0 0 0 0 1s 100 1 801
32 changes: 22 additions & 10 deletions main/srv1/share/locale/germany/map/metin2_map_c1/npc.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//type cx cy sx sy z dir time percent count vnum
//-----------------------------------------------------------------------------------
// ����NPC
m 444 623 0 0 0 7 1m 100 1 20340
m 444 627 0 0 0 7 1m 100 1 20341
Expand All @@ -16,9 +17,11 @@ m 403 586 0 0 0 1 1m 100 1 9002
m 383 693 0 0 0 5 1m 100 1 9003
m 315 560 0 0 0 3 1m 100 1 9005
m 417 671 0 0 0 6 1m 100 1 9006
m 415 673 0 0 0 6 1m 100 1 20095
m 393 692 0 0 0 5 1m 100 1 20016
m 372 701 0 0 0 7 1m 100 1 20381
m 394 702 0 0 0 3 1s 100 1 20091
m 373 692 0 0 0 5 1m 100 1 20091
m 431 609 0 0 0 8 1m 100 1 20092
m 314 553 0 0 0 3 1m 100 1 9010
// ��ε�----------------------------------------------------------------------------
m 711 234 0 0 0 0 1m 100 1 9009
m 732 390 0 0 0 0 1m 100 1 9009
Expand All @@ -37,14 +40,14 @@ m 378 577 1 1 0 0 1m 100 1 20003
//g 323 617 1 1 0 0 1m 100 1 11003
m 292 718 1 1 0 0 1m 100 1 20005
m 336 770 1 1 0 0 1m 100 1 20006
m 425 716 1 1 0 0 1m 100 1 20011
m 465 612 1 1 0 0 1m 100 1 20018
m 425 716 1 1 0 7 1m 100 1 20011
m 302 263 1 1 0 1 1m 100 1 20018
g 383 740 1 1 0 0 1m 100 1 12007
// ����----------------------------------------------------------------------------------
m 137 126 0 0 0 0 1m 100 1 10005
// ������ npc
m 125 1118 0 0 0 4 1m 100 1 20009
m 432 685 0 0 0 4 1m 100 1 9012
m 432 685 0 0 0 9 1m 100 1 9012
//m 396 1148 0 0 0 3 1m 100 1 10089

// ���
Expand All @@ -57,16 +60,26 @@ m 323 617 1 1 0 0 1m 100 1 20041
// �ٳ��� -----------------------------------------------------------------------------------
s 0 0 0 0 0 0 600s 100 10 5004
// QuestNPC-------------------------------------------------------------------------------
m 286 639 0 0 0 0 1m 100 1 20355
m 286 639 0 0 0 3 1m 100 1 20355
m 468 714 0 0 0 0 1m 100 1 20354
m 771 78 0 0 0 0 1m 100 1 20358
m 114 960 0 0 0 0 1m 100 1 20357
m 285 285 0 0 0 0 1m 100 1 20084
m 285 285 0 0 0 3 1m 100 1 20084
// �̺�Ʈ�� NPC
m 447 928 0 0 0 0 1m 100 1 20086
m 456 936 0 0 0 0 1m 100 1 20087
m 300 867 0 0 0 0 1m 100 1 20090

// over9���� NPC
m 314 565 0 0 0 3 1m 100 1 20094

// Ponys und Pferde
m 390 744 0 0 0 0 1m 100 1 20029
m 384 742 0 0 0 0 1m 100 1 20029
m 379 746 0 0 0 0 1m 100 1 20029
m 379 739 0 0 0 0 1m 100 1 20030
m 385 736 0 0 0 0 1m 100 1 20030

// Damage Puppen
m 487 711 0 0 0 7 5s 100 1 50500
m 490 704 0 0 0 7 5s 100 1 50501
Expand All @@ -75,7 +88,6 @@ m 486 687 0 0 0 7 5s 100 1 50503
m 485 678 0 0 0 7 5s 100 1 50504
m 485 671 0 0 0 7 5s 100 1 50505

// over9���� NPC
m 384 567 0 0 0 0 1m 100 1 20094
// Event NPC
m 383 709 0 0 0 0 1s 100 1 801

m 321 735 0 0 0 3 1m 100 1 20001
Loading

0 comments on commit a04c67f

Please sign in to comment.