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

New Component: NWN-ish Disarm #110

Merged
merged 34 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2fe497f
Knockdown
4Luke4 Sep 4, 2024
ff8cc14
Update knockdown.lua
4Luke4 Sep 4, 2024
ab88ec4
Misc tweaks
4Luke4 Sep 5, 2024
d351190
Update knockdown.lua
4Luke4 Sep 6, 2024
14d435f
Update knockdown.tph
4Luke4 Sep 6, 2024
08af72f
Update knockdown.tph
4Luke4 Sep 6, 2024
e4a7878
Update knockdown.lua
4Luke4 Sep 6, 2024
acadb21
Disarm
4Luke4 Sep 30, 2024
5fe699b
Add missing bam files
4Luke4 Oct 1, 2024
d79e727
Update readme-cdtweaks.html
4Luke4 Oct 1, 2024
afbd0ce
Update disarm.tph
4Luke4 Oct 1, 2024
21cc411
Delete comp_2840.tpa
4Luke4 Oct 2, 2024
ee5345f
Create comp_6000.tpa
4Luke4 Oct 2, 2024
c50eb10
Update setup-cdtweaks.tp2
4Luke4 Oct 2, 2024
2bfc806
Slightly tweak implementation
4Luke4 Oct 18, 2024
db2645c
Update disarm.lua
4Luke4 Oct 18, 2024
13ddb86
Update disarm.tph
4Luke4 Oct 18, 2024
f86dd1e
Update disarm.lua
4Luke4 Oct 20, 2024
8e0788e
Better feedback
4Luke4 Oct 24, 2024
aa2b07d
Update disarm.tph
4Luke4 Oct 24, 2024
5545725
Update disarm.lua
4Luke4 Oct 24, 2024
24b849a
Update disarm.lua
4Luke4 Oct 24, 2024
5303c86
Yet another implementation
4Luke4 Dec 18, 2024
c8b3bbe
Misc tweaks
4Luke4 Jan 10, 2025
a2de5bb
Delete gtprone.bam
4Luke4 Jan 17, 2025
ad5e76a
Delete portrait_icon.bam
4Luke4 Jan 17, 2025
a4d622c
Delete spl_icon.bam
4Luke4 Jan 17, 2025
5499106
Update m_gttbls.lua
4Luke4 Jan 17, 2025
0310f19
Update misc.tph
4Luke4 Jan 17, 2025
b3823d9
Update misc.tph
4Luke4 Jan 17, 2025
a82c955
Update misc.tph
4Luke4 Jan 17, 2025
afd1229
Update weidu.tra
4Luke4 Jan 17, 2025
7e10c52
Update weidu.tra
4Luke4 Jan 17, 2025
308fd68
Merge branch 'master' into disarm
CamDawg Jan 23, 2025
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
13 changes: 13 additions & 0 deletions cdtweaks/languages/english/disarm.tra
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@0 = "Disarm"

@1 = "Disarm

The character can attempt to disarm an opponent in melee combat. The combatant with the larger weapon gains a +2 bonus per size category of difference. If the opponent fails a Save vs. Breath, then the weapon flies from the opponent's hands."

//@100 = "The selected target is out of range"
@101 = "Disarm Canceled: Inventory full"
@102 = "Disarm: Resisted"
@103 = "Disarm: Hit"
@104 = "This feat cannot be used while wielding a ranged weapon"
@105 = "The targeted creature cannot be disarmed"
//@106 = "Unaffected by effects from Disarm"
2 changes: 2 additions & 0 deletions cdtweaks/languages/english/weidu.tra
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,8 @@ Use Baldur.lua options: a7_interval_ini
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\

@600000 = "Disarm class feat for Rogues [Luke (EEex)]"

@602000 = "Spellcaster Skill/Counterspell Class Talent [Luke (EEex)]"

@603000 = "Spontaneous Casting for Clerics [Luke]"
Expand Down
13 changes: 13 additions & 0 deletions cdtweaks/languages/italian/disarm.tra
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@0 = "Disarmare"

@1 = "Disarmare

Il personaggio può tentare di disarmare un avversario durante un combattimento in mischia. Il combattente con l'arma più grande ottiene un bonus di +2 per ogni categoria di taglia di differenza. Se l'avversario fallisce un tiro-salvezza contro Soffio, l'arma gli vola via dalle mani."

//@100 = "Il bersaglio selezionato è fuori portata"
@101 = "Disarmare Annullato: Inventario pieno"
@102 = "Disarmare: Resistito"
@103 = "Disarmare: Colpito"
@104 = "Questa abilità non può essere usata mentre si brandisce un'arma a distanza"
@105 = "La creatura selezionata non può essere disarmata"
//@106 = "Non soggetto agli effetti di Disarmare"
3 changes: 3 additions & 0 deletions cdtweaks/languages/italian/weidu.tra
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ o rimpiazzata da - un'altra facente parte di uno dei mods installati.~
@27 = ~E' necessario utilizzare Modmerge prima che i mod possano essere installati su questo gioco. Controllare il readme per ulteriori informazioni e per un link per scaricare Modmerge.~
@28 = ~Non sono disponibili abbastanza slot per lo stato dell'incantesimo o di tipo secondario per installare questo componente.~
@29 = "Questo componente richiede EEex (https://github.com/Bubb13/EEex)."
@30 = "Talenti in stile NWN"

// questo componente non è pronto, puoi saltare la traduzione di questo blocco
//@100 = ~Programma di installazione automatizzato~
Expand Down Expand Up @@ -735,6 +736,8 @@ Usa opzioni di Baldur.lua: a7_interval_ini
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\

@600000 = "Aggiungi talento di classe Disarmare per i Ladri [Luke (EEex)]"

@602000 = "Aggiungi talento di classe Sapienza Magica / Controincantesimo per gli incantatori [Luke (EEex)]"

@603000 = "Aggiungi talento di classe Lancio Spontaneo per i Chierici [Luke]"
Expand Down
17 changes: 17 additions & 0 deletions cdtweaks/lib/comp_6000.tpa
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
///// \\\\\
///// Disarm class feat for Rogues \\\\\
///// \\\\\
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\

WITH_SCOPE BEGIN
INCLUDE "cdtweaks\luke\misc.tph"
INCLUDE "cdtweaks\ardanis\functions.tph"
//
INCLUDE "cdtweaks\lib\disarm.tph"
WITH_TRA "cdtweaks\languages\english\disarm.tra" "cdtweaks\languages\%LANGUAGE%\disarm.tra" BEGIN
LAF "DISARM" END
END
END
49 changes: 49 additions & 0 deletions cdtweaks/lib/disarm.tph
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
DEFINE_ACTION_FUNCTION "DISARM"
BEGIN
LAF "GT_ADD_SPELL"
INT_VAR
"level" = 4
"preferredSlot" = 44
"type" = 4
STR_VAR
"idsName" = "THIEF_DISARM"
RET
"THIEF_DISARM" = "resName"
END
//
WITH_SCOPE BEGIN
ACTION_TO_LOWER "THIEF_DISARM"
// Disarm (main spl file)
CREATE "spl" "%THIEF_DISARM%"
COPY_EXISTING "%THIEF_DISARM%.spl" "override"
WRITE_LONG NAME1 RESOLVE_STR_REF (@0)
WRITE_LONG NAME2 "-1"
WRITE_LONG UNIDENTIFIED_DESC RESOLVE_STR_REF (@1)
WRITE_LONG DESC "-1"
WRITE_LONG 0x18 (BIT14 BOR BIT25) // ignore dead/wild magic, castable when silenced
WRITE_SHORT 0x1C 4 // innate
WRITE_LONG 0x34 1 // level
WRITE_ASCII 0x3A "%DEST_RES%B" #8 // icon
//
LPF "ADD_SPELL_HEADER" INT_VAR "range" = 0 STR_VAR "icon" = "%DEST_RES%B" END
//
LPF "ADD_SPELL_EFFECT" INT_VAR "opcode" = 138 "target" = 1 "parameter2" = 0 END // SEQ_ATTACK
BUT_ONLY
// icon
COPY "cdtweaks\luke\bam\class\disarm.bam" "override\%THIEF_DISARM%b.bam"
END
// lua
WITH_SCOPE BEGIN
OUTER_SET "feedback_strref_inventory_full" = RESOLVE_STR_REF (@101)
OUTER_SET "feedback_strref_resisted" = RESOLVE_STR_REF (@102)
OUTER_SET "feedback_strref_hit" = RESOLVE_STR_REF (@103)
OUTER_SET "feedback_strref_melee_only" = RESOLVE_STR_REF (@104)
OUTER_SET "feedback_strref_cannot_be_disarmed" = RESOLVE_STR_REF (@105)
//
LAF "APPEND_LUA_FUNCTION" STR_VAR "description" = "Class/Kit Abilities" "sourceFileSpec" = "cdtweaks\luke\lua\class\disarm.lua" "destRes" = "m_gtspcl" END
END
//
ACTION_IF !(FILE_EXISTS_IN_GAME "m_gttbls.lua") BEGIN
COPY "cdtweaks\luke\lua\m_gttbls.lua" "override"
END
END
Binary file added cdtweaks/luke/bam/class/disarm.bam
Binary file not shown.
Loading