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

Create Tunneller and Create Digger setup #3719

Merged
merged 41 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
868992c
swapped effect 65 and 66's names
Spatulade Apr 15, 2023
05bf7b9
Merge branch 'dkfans:master' into master
Spatulade Nov 29, 2023
9aff982
Merge branch 'dkfans:master' into master
Spatulade Aug 1, 2024
ed0f823
Merge branch 'dkfans:master' into master
Spatulade Oct 2, 2024
829d516
Merge branch 'dkfans:master' into master
Spatulade Nov 18, 2024
fbfac9e
setup of cfgs for create tunneller
Spatulade Nov 23, 2024
f83b878
Update spritecolors.toml
Spatulade Nov 23, 2024
548c288
Added playerstate
Loobinex Nov 24, 2024
b34f113
Added the new hardcoded player state
Loobinex Nov 24, 2024
7b15f6e
Flipped the icon to be correct
Loobinex Nov 24, 2024
800008e
Added Power Tunneller function
Loobinex Nov 24, 2024
2a07233
Added missing use_power and comments
Loobinex Nov 24, 2024
c9c1781
fixing comment
walt253 Nov 24, 2024
7ba40ed
Give Tunnellers a basic cost
Loobinex Nov 24, 2024
5775727
Dwarves come in groups of 7
Loobinex Nov 24, 2024
37e2f50
change cost and power + codename
walt253 Nov 24, 2024
a87e6be
POWER_TUNNELLER on the state too
walt253 Nov 24, 2024
99191a8
Merge branch 'master' into create_tunnellers
walt253 Nov 24, 2024
f423855
rename countdown_282 to countdown
walt253 Nov 24, 2024
3f93897
Merge branch 'create_tunnellers' into countdown_282
walt253 Nov 24, 2024
ef1853d
Merge pull request #1 from walt253/countdown_282
Spatulade Nov 24, 2024
8a591f6
change PanelTabIndex
walt253 Nov 24, 2024
bb0b752
Temp commit for qq
Loobinex Nov 24, 2024
0a6fb28
Revert "Temp commit for qq"
Loobinex Nov 24, 2024
699240a
functional prototype of no more playerstate
Loobinex Nov 24, 2024
fe6421d
Cleanup workstates
Loobinex Nov 25, 2024
809ea67
Fixed call to arms that I broke
Loobinex Nov 25, 2024
5b197bb
Got rid of the holes in the enum
Loobinex Nov 25, 2024
1f6a9f1
Still use PLAYER_STATE_CREATEDIGGER
Loobinex Nov 25, 2024
7aaf9a1
Implemented Cost Formula
Loobinex Nov 25, 2024
7a9c447
Fixed the diggers that I broke again
Loobinex Nov 25, 2024
504c470
time bomb panel tab index 27
walt253 Nov 25, 2024
ce0dbbb
added comment for digger costformula
walt253 Nov 25, 2024
1c09db3
Fixed Summon Imp string
Loobinex Nov 25, 2024
dbe7da1
Put in translation strings
Loobinex Nov 25, 2024
2b777c8
french translation
walt253 Nov 25, 2024
09126ec
fix missing quotation mark on guitext:1073
walt253 Nov 25, 2024
79065e9
Added dutch and german translations
Loobinex Nov 25, 2024
8a922d5
Added Chinese translation
Loobinex Nov 25, 2024
8121ab5
russian translation
walt253 Nov 25, 2024
89e47b8
Update gtext_rus.po
walt253 Nov 25, 2024
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
21 changes: 21 additions & 0 deletions config/fxdata/magic.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2041,6 +2041,27 @@ CastExpandFunc = general_expand
Spell = SPELL_SIGHT
UseFunction = magic_use_power_apply_spell

[power28]
Name = POWER_TUNLR
walt253 marked this conversation as resolved.
Show resolved Hide resolved
NameTextID = 1078
TooltipTextID = 1079
SymbolSprites = 809 811
PointerSprites = 344
PanelTabIndex = 17
SoundSamples = 0
SoundPlayed = 0
Power = 0 0 0 0 0 0 0 0 0 0
walt253 marked this conversation as resolved.
Show resolved Hide resolved
Cost = 150 150 150 150 150 150 150 150 150
walt253 marked this conversation as resolved.
Show resolved Hide resolved
Castability = OWNED_GROUND
Artifact = SPELLBOOK_TUNLR
Properties =
PlayerState = PLAYER_STATE_CREATEGOODDIGGER
ParentPower = NOPOWER
CastExpandFunc = do_not_expand
UseFunction = magic_use_power_imp
;only used with magic_use_power_imp, sets the type of unit spawned
CreatureType = TUNNELLER
walt253 marked this conversation as resolved.
Show resolved Hide resolved

; Specials types.

[special0]
Expand Down
24 changes: 24 additions & 0 deletions config/fxdata/objects.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4302,3 +4302,27 @@ Persistence = 1
Immobile = 1
Properties = CHOWNED_ON_ROOM_CLAIM
UpdateFunction = NULL

[object179]
Name = SPELLBOOK_TUNLR
walt253 marked this conversation as resolved.
Show resolved Hide resolved
Genre = SPELLBOOK
AnimationID = 777
AnimationSpeed = 256
Size_XY = 0
Size_Z = 0
MaximumSize = 300
DestroyOnLava = 1
DestroyOnLiquid = 0
Health = 0
FallAcceleration = 10
LightUnaffected = 0
MapIcon = -1
LightIntensity = 62
LightRadius = 4
LightIsDynamic = 0
RandomStartFrame = 0
DrawClass = 2
Persistence = 1
Immobile = 1
Properties = CHOWNED_ON_ROOM_CLAIM
UpdateFunction = NULL
6 changes: 6 additions & 0 deletions config/fxdata/playerstates.toml
Original file line number Diff line number Diff line change
Expand Up @@ -332,3 +332,9 @@ Name = "PLAYER_STATE_VISION"
PowerKind = "POWER_VISION"
PointerGroup = "SPELL"
StopOwnUnits = true

[playerstate55]
Name = "PLAYER_STATE_CREATEGOODDIGGER"
PowerKind = "POWER_TUNLR"
PointerGroup = "SPELL"
StopOwnUnits = false
2 changes: 2 additions & 0 deletions config/fxdata/spritecolors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ pointer_sprites = [
[ 80, 80, 235, 243, 259, 251, 0, 287, 325, 306],#quadptr_power_mkdigger
[ 38, 38, 271, 272, 274, 273, 0, 296, 334, 315],#tileptr_room_guardpst
[ 9, 9, 275, 276, 278, 277, 0, 297, 335, 316],#tileptr_trap_alarm
[344, 344, 352, 360, 368, 376, 0, 384, 400, 392],#quadptr_power_mktunlr
[408, 408, 416, 424, 432, 440, 0, 448, 464, 456],#quadptr_power_mkdiggergeneric
]

# Stuff in gui1-xx.dat
Expand Down
10 changes: 10 additions & 0 deletions lang/gtext_eng.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5670,4 +5670,14 @@ msgstr ""
#: guitext:1077
msgctxt "Door description"
msgid "Midas Door: This door consumes gold from the owner to stay completely indestructible. RMB zoom."
msgstr ""

#: guitext:1078
msgctxt "Keeper spell name"
msgid "Recruit Tunneller"
msgstr ""

#: guitext:1079
msgctxt "Keeper spell description"
msgid "Recruit Tunneller: Summon a new Tunneller anywhere in your dungeon.
walt253 marked this conversation as resolved.
Show resolved Hide resolved
msgstr ""
1 change: 1 addition & 0 deletions src/config_players.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ enum PlayerStates {
PSt_Slow,
PSt_Flight,
PSt_Vision,
PSt_CreateGoodDigger,
PSt_ListEnd
};

Expand Down
1 change: 1 addition & 0 deletions src/frontend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,7 @@ long player_state_to_packet(PlayerState work_state, PowerKind pwkind, TbBool alr
case PSt_CtrlDirect:
case PSt_FreeCtrlDirect:
case PSt_CreateDigger:
case PSt_CreateGoodDigger:
case PSt_CaveIn:
case PSt_Heal:
case PSt_Lightning:
walt253 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
1 change: 1 addition & 0 deletions src/packets_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,7 @@ TbBool process_dungeon_control_packet_clicks(long plyr_idx)
case PSt_SightOfEvil:
case PSt_Lightning:
case PSt_CreateDigger:
case PSt_CreateGoodDigger:
case PSt_DestroyWalls:
walt253 marked this conversation as resolved.
Show resolved Hide resolved
if (((pckt->control_flags & PCtr_LBtnRelease) != 0) && ((pckt->control_flags & PCtr_MapCoordsValid) != 0))
{
Expand Down