Skip to content

Commit

Permalink
Version 8
Browse files Browse the repository at this point in the history
  • Loading branch information
@CamDawg
CamDawg committed Jan 13, 2019
1 parent cb33fcb commit d6fb10a
Show file tree
Hide file tree
Showing 10 changed files with 104 additions and 127 deletions.
16 changes: 0 additions & 16 deletions cdtweaks/dlg/depart.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ IF ~Global("EnteredArmInn","GLOBAL",1)
!Global("IslandTravel","GLOBAL",1) // not on Werewolf Isle
!Global("teth","GLOBAL",1) // not trapped under Candlekeep AR2613, 2615, 2619, 5506
!Global("teth","GLOBAL",2)
!Global("Z!EmulAreaCheck","GLOBAL","5100") // Gnoll Stronghold
!Global("Z!EmulAreaCheck","GLOBAL","5101") // Gnoll Stronghold Xvart Cave
!Global("Z!EmulAreaCheck","GLOBAL","5102") // Gnoll Stronghold Treasure Cave
!Global("Z!EmulAreaCheck","GLOBAL","5103") // Gnoll Stronghold Carrion Crawler Cave
!Global("Z!EmulAreaCheck","GLOBAL","0506") // Chess Board
!Global("Z!EmulAreaCheck","GLOBAL","0507") // Ice Node
!Global("Z!EmulAreaCheck","GLOBAL","0508") // Fire Node
Expand All @@ -27,10 +23,6 @@ IF ~Global("EnteredBeregost","GLOBAL",1)
!Global("IslandTravel","GLOBAL",1)
!Global("teth","GLOBAL",1)
!Global("teth","GLOBAL",2)
!Global("Z!EmulAreaCheck","GLOBAL","5100") // Gnoll Stronghold
!Global("Z!EmulAreaCheck","GLOBAL","5101") // Gnoll Stronghold Xvart Cave
!Global("Z!EmulAreaCheck","GLOBAL","5102") // Gnoll Stronghold Treasure Cave
!Global("Z!EmulAreaCheck","GLOBAL","5103") // Gnoll Stronghold Carrion Crawler Cave
!Global("Z!EmulAreaCheck","GLOBAL","0506") // Chess Board
!Global("Z!EmulAreaCheck","GLOBAL","0507") // Ice Node
!Global("Z!EmulAreaCheck","GLOBAL","0508") // Fire Node
Expand All @@ -51,10 +43,6 @@ IF ~GlobalGT("Chapter","GLOBAL",1)
!Global("IslandTravel","GLOBAL",1)
!Global("teth","GLOBAL",1)
!Global("teth","GLOBAL",2)
!Global("Z!EmulAreaCheck","GLOBAL","5100") // Gnoll Stronghold
!Global("Z!EmulAreaCheck","GLOBAL","5101") // Gnoll Stronghold Xvart Cave
!Global("Z!EmulAreaCheck","GLOBAL","5102") // Gnoll Stronghold Treasure Cave
!Global("Z!EmulAreaCheck","GLOBAL","5103") // Gnoll Stronghold Carrion Crawler Cave
!Global("Z!EmulAreaCheck","GLOBAL","0506") // Chess Board
!Global("Z!EmulAreaCheck","GLOBAL","0507") // Ice Node
!Global("Z!EmulAreaCheck","GLOBAL","0508") // Fire Node
Expand All @@ -76,10 +64,6 @@ IF ~!Global("Chapter","GLOBAL",7) // you're not wanted in the Gate for murder
!Global("IslandTravel","GLOBAL",1)
!Global("teth","GLOBAL",1)
!Global("teth","GLOBAL",2)
!Global("Z!EmulAreaCheck","GLOBAL","5100") // Gnoll Stronghold
!Global("Z!EmulAreaCheck","GLOBAL","5101") // Gnoll Stronghold Xvart Cave
!Global("Z!EmulAreaCheck","GLOBAL","5102") // Gnoll Stronghold Treasure Cave
!Global("Z!EmulAreaCheck","GLOBAL","5103") // Gnoll Stronghold Carrion Crawler Cave
!Global("Z!EmulAreaCheck","GLOBAL","0506") // Chess Board
!Global("Z!EmulAreaCheck","GLOBAL","0507") // Ice Node
!Global("Z!EmulAreaCheck","GLOBAL","0508") // Fire Node
Expand Down
10 changes: 0 additions & 10 deletions cdtweaks/dw_components/ankheg_shells.tpa
View file

This file was deleted.

66 changes: 35 additions & 31 deletions cdtweaks/dw_components/wait_at_inns.tpa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,36 @@ DEFINE_ACTION_FUNCTION wait_at_inns BEGIN
END

<<<<<<<< .../stratagems-inline/inn_data.2da
npc state_tutu state_tutu2 state_bgt state_bgt2 state_ee state_ee2 response beregost_xloc beregost_yloc friendly_xloc friendly_yloc nashkel_xloc nashkel_yloc elfsong_xloc elfsong_yloc
AJANTIS 0 -1 0 -1 0 -1 20810 824 961 766 966 602 463 537 704
SUFINCH 3 -1 3 -1 -1 -1 20840 818 970 800 980 590 448 568 717
IMOEN 0 -1 -1 -1 2 -1 20811 812 980 814 1006 573 436 598 737
IMOEN2 -1 -1 18 -1 -1 -1 20811 812 980 814 1006 573 436 598 737
A#FMURN 1 -1 1 -1 1 -1 20841 806 990 760 900 453 433 630 730
KAGAIN 0 -1 2 -1 2 -1 20812 800 1000 721 790 247 431 661 726
J#INDI01 0 -1 0 -1 0 -1 20842 749 1010 740 768 264 444 677 694
EDWIN 0 -1 9 -1 0 -1 20813 788 1020 778 754 284 454 692 664
BRANWEN 0 -1 0 -1 0 -1 20814 776 1040 479 634 461 394 637 621
SAFANA 0 -1 2 -1 2 -1 20815 764 1060 523 595 429 411 783 732
GARRICK 0 -1 2 -1 2 -1 20816 752 1080 575 562 367 580 837 783
CORAN 0 -1 0 -1 0 -1 20817 740 1100 614 521 402 613 772 853
KIVAN 0 -1 2 -1 2 -1 20818 730 1128 1070 663 260 307 686 843
YESLICK 0 -1 0 -1 0 -1 20819 820 1110 1117 697 251 351 653 782
XAN 0 -1 2 -1 2 -1 20820 860 965 1178 738 531 392 702 736
ALORA 0 -1 0 -1 0 -1 20821 850 985 1224 761 525 428 806 455
FALDORN 0 -1 0 -1 0 -1 20822 840 1005 817 720 448 423 823 517
QUAYLE 0 -1 2 -1 2 -1 20823 830 1025 802 686 440 473 875 538
SHARTEEL 0 -1 2 -1 2 -1 20824 820 1045 880 745 515 550 921 525
TIAX 0 -1 2 -1 2 -1 20825 810 1065 939 718 480 525 1004 605
VICONIA 0 -1 16 -1 2 -1 20826 800 1085 789 759 444 505 745 674
JAHEIRA 0 1 78 79 4 5 20831 790 1105 701 903 669 161 440 713
KHALID 0 1 4 5 4 5 20832 806 1138 726 924 729 199 471 690
DYNAHEIR 0 1 4 5 4 5 20833 894 970 316 611 850 277 595 476
MINSC 0 1 14 15 4 5 20834 882 990 356 641 839 318 617 507
XZAR 0 1 4 5 4 5 20835 870 1010 682 684 747 362 692 421
MONTARON 0 1 4 5 4 5 20836 855 1030 667 725 706 396 734 397
SKIE 0 1 4 5 4 5 20837 846 1050 571 428 583 260 822 355
ELDOTH 0 1 4 5 4 5 20838 834 1070 621 466 525 278 873 377
npc state_tutu state_tutu2 state_bgt state_bgt2 state_ee state_ee2 response beregost_xloc beregost_yloc friendly_xloc friendly_yloc nashkel_xloc nashkel_yloc elfsong_xloc elfsong_yloc use_cpm
AJANTIS 0 -1 0 -1 0 -1 20810 824 961 766 966 602 463 537 704 1
SUFINCH 3 -1 3 -1 -1 -1 20840 818 970 800 980 590 448 568 717 0
IMOEN 0 -1 -1 -1 2 -1 20811 812 980 814 1006 573 436 598 737 1
IMOEN2 -1 -1 18 -1 -1 -1 20811 812 980 814 1006 573 436 598 737 1
A#FMURN 1 -1 1 -1 1 -1 20841 806 990 760 900 453 433 630 730 0
KAGAIN 0 -1 2 -1 2 -1 20812 800 1000 721 790 247 431 661 726 1
J#INDI01 0 -1 0 -1 0 -1 20842 749 1010 740 768 264 444 677 694 0
EDWIN 0 -1 9 -1 0 -1 20813 788 1020 778 754 284 454 692 664 1
BRANWEN 0 -1 0 -1 0 -1 20814 776 1040 479 634 461 394 637 621 1
SAFANA 0 -1 2 -1 2 -1 20815 764 1060 523 595 429 411 783 732 1
GARRICK 0 -1 2 -1 2 -1 20816 752 1080 575 562 367 580 837 783 1
CORAN 0 -1 0 -1 0 -1 20817 740 1100 614 521 402 613 772 853 1
KIVAN 0 -1 2 -1 2 -1 20818 730 1128 1070 663 260 307 686 843 1
YESLICK 0 -1 0 -1 0 -1 20819 820 1110 1117 697 251 351 653 782 1
XAN 0 -1 2 -1 2 -1 20820 860 965 1178 738 531 392 702 736 1
ALORA 0 -1 0 -1 0 -1 20821 850 985 1224 761 525 428 806 455 1
FALDORN 0 -1 0 -1 0 -1 20822 840 1005 817 720 448 423 823 517 1
QUAYLE 0 -1 2 -1 2 -1 20823 830 1025 802 686 440 473 875 538 1
SHARTEEL 0 -1 2 -1 2 -1 20824 820 1045 880 745 515 550 921 525 1
TIAX 0 -1 2 -1 2 -1 20825 810 1065 939 718 480 525 1004 605 1
VICONIA 0 -1 16 -1 2 -1 20826 800 1085 789 759 444 505 745 674 1
JAHEIRA 0 1 78 79 4 5 20831 790 1105 701 903 669 161 440 713 1
KHALID 0 1 4 5 4 5 20832 806 1138 726 924 729 199 471 690 1
DYNAHEIR 0 1 4 5 4 5 20833 894 970 316 611 850 277 595 476 1
MINSC 0 1 14 15 4 5 20834 882 990 356 641 839 318 617 507 1
XZAR 0 1 4 5 4 5 20835 870 1010 682 684 747 362 692 421 1
MONTARON 0 1 4 5 4 5 20836 855 1030 667 725 706 396 734 397 1
SKIE 0 1 4 5 4 5 20837 846 1050 571 428 583 260 822 355 1
ELDOTH 0 1 4 5 4 5 20838 834 1070 621 466 525 278 873 377 1
>>>>>>>>

COPY - ~.../stratagems-inline/inn_data.2da~ ~.../stratagems-inline~
Expand All @@ -46,7 +46,11 @@ ELDOTH 0 1 4 5 4
READ_2DA_ENTRY_FORMER inn_data i j val
SPRINT ~%var%~ ~%val%~
END
SPRINT script_ID ~%npc%_POSTJOIN~
PATCH_IF use_cpm BEGIN
SPRINT script_ID ~%npc%_POST~ // use, say, jaheira_post from the CPMs istead of jaheira_postgame from the pdilaog scan
END ELSE BEGIN
SPRINT script_ID ~%npc%_POSTJOIN~
END
PATCH_IF VARIABLE_IS_SET ~%script_ID%~ BEGIN
SPRINT script EVALUATE_BUFFER ~%%script_ID%%~
PATCH_IF enhanced_edition BEGIN
Expand Down
1 change: 1 addition & 0 deletions cdtweaks/dw_components/yeslick_axes.tpa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ DEFINE_ACTION_FUNCTION yeslick_axes BEGIN
SET_2DA_ENTRY 7 13 4 2
SET_2DA_ENTRY 12 13 4 2
SET_2DA_ENTRY 0 0 4 ~~
IF_EXISTS

END
5 changes: 4 additions & 1 deletion cdtweaks/lib/bg_style_profs.tpa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ END

DEFINE_PATCH_MACRO ~prof_descripts~ BEGIN

SPRINT new_weap ""
PATCH_IF (prof = 100) BEGIN // bows
SPRINT new_weap ~%bow%~ // long bow, short bow
END ELSE
Expand All @@ -67,7 +68,9 @@ DEFINE_PATCH_MACRO ~prof_descripts~ BEGIN
PATCH_IF (prof = 107) BEGIN // spear
SPRINT new_weap ~%spear%~ // spears and halberds (spears don't need changing)
END
REPLACE_TEXTUALLY CASE_INSENSITIVE ~%prof_text_match%.+$~ ~%prof_text% %new_weap%~
PATCH_IF ("%new_weap%" STRING_COMPARE_CASE "") BEGIN // make sure new_weap is actually set before blindly patching
REPLACE_TEXTUALLY CASE_INSENSITIVE ~%prof_text_match%.+$~ ~%prof_text% %new_weap%~
END

END

Expand Down
5 changes: 4 additions & 1 deletion cdtweaks/lib/iwd_style_profs.tpa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ END

DEFINE_PATCH_MACRO ~prof_descripts~ BEGIN

SPRINT new_weap ""
PATCH_IF (prof = 95) BEGIN // bows
SPRINT new_weap ~%bow%~
END ELSE
Expand All @@ -64,7 +65,9 @@ DEFINE_PATCH_MACRO ~prof_descripts~ BEGIN
PATCH_IF (prof = 104) BEGIN // misile
SPRINT new_weap ~%prof_missile%~
END
REPLACE_TEXTUALLY CASE_INSENSITIVE ~%prof_text_match%.+$~ ~%prof_text% %new_weap%~
PATCH_IF ("%new_weap%" STRING_COMPARE_CASE "") BEGIN // make sure new_weap is actually set before blindly patching
REPLACE_TEXTUALLY CASE_INSENSITIVE ~%prof_text_match%.+$~ ~%prof_text% %new_weap%~
END

END

Expand Down
Loading

0 comments on commit d6fb10a

Please sign in to comment.