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.

Sign up for GitHub

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

Jump to bottom

Create Tunneller and Create Digger setup #3719

Merged
merged 41 commits into from
Nov 25, 2024
Merged

Create Tunneller and Create Digger setup #3719

Show file tree
Hide file tree
Changes from 30 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
63 changes: 45 additions & 18 deletions config/fxdata/magic.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1447,6 +1447,8 @@ SoundPlayed = 0
Power = 0 0 0 0 0 0 0 0 0 0
; Power cost at each overload level.
Cost = 0 0 0 0 0 0 0 0 0
; Special formulas for the cost. NONE, DIGGER, DWARF. Defaults to NONE
CostFormula = NONE
; How long the power remains in effect in game turns.
Duration = 0
; How long after the power is used the player has to wait to cast again. Only for powers that need a delay.
Expand Down Expand Up @@ -1523,14 +1525,15 @@ SoundSamples = 831
SoundPlayed = 0
Power = 0 0 0 0 0 0 0 0 0 0
Cost = 150 150 150 150 150 150 150 150 150
CostFormula = DIGGER
Castability = OWNED_GROUND
Artifact = SPELLBOOK_IMP
Properties =
PlayerState = PLAYER_STATE_CREATEDIGGER
ParentPower = NOPOWER
CastExpandFunc = do_not_expand
UseFunction = magic_use_power_imp
;only used with magic_use_power_imp, sets the type of unit spawned
; Only used with 'magic_use_power_imp' and 'magic_use_power_tunneller', this sets the kind of creature spawned.
CreatureType = IMP

[power3]
Expand Down Expand Up @@ -1587,6 +1590,7 @@ Cost = 50 60 70 80 90 100 110 120 130
Castability = ANYWHERE UNREVEALED
Artifact = SPELLBOOK_SOE
Properties = HAS_PROGRESS
; PLAYER_STATE_SIGHTOFEVIL has your cursor at a high level
PlayerState = PLAYER_STATE_SIGHTOFEVIL
walt253 marked this conversation as resolved.
Show resolved Hide resolved
ParentPower = NOPOWER
CastExpandFunc = sight_of_evil_expand
Expand Down Expand Up @@ -1628,7 +1632,7 @@ Duration = 100
Castability = ALL_GROUND REVEALED_TEMP
Artifact = SPELLBOOK_CAVI
Properties = HAS_PROGRESS
PlayerState = PLAYER_STATE_CAVEIN
PlayerState = PLAYER_STATE_CAST_SUBTILE
ParentPower = NOPOWER
CastExpandFunc = general_expand
UseFunction = magic_use_power_cave_in
Expand All @@ -1648,7 +1652,7 @@ Duration = 16
Castability = ALL_GROUND OWNED_CRTRS ALLIED_CRTRS BOUND_CRTRS CUSTODY_CRTRS
Artifact = SPELLBOOK_HEAL
Properties =
PlayerState = PLAYER_STATE_HEAL
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
CastExpandFunc = general_expand
Spell = SPELL_HEAL
Expand Down Expand Up @@ -1688,7 +1692,7 @@ Cooldown = 20
Castability = ALL_GROUND REVEALED_TEMP NEEDS_DELAY
Artifact = SPELLBOOK_LIGHTN
Properties =
PlayerState = PLAYER_STATE_LIGHTNING
PlayerState = PLAYER_STATE_CAST_SUBTILE
ParentPower = NOPOWER
CastExpandFunc = general_expand
UseFunction = magic_use_power_lightning
Expand All @@ -1708,7 +1712,7 @@ Cost = 100 200 300 400 500 600 700 800 900
Castability = ALL_GROUND OWNED_CRTRS ALLIED_CRTRS BOUND_CRTRS CUSTODY_CRTRS
Artifact = SPELLBOOK_SPDC
Properties =
PlayerState = PLAYER_STATE_SPEEDUP
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
CastExpandFunc = general_expand
Spell = SPELL_SPEED
Expand All @@ -1728,7 +1732,7 @@ Cost = 100 200 300 400 500 600 700 800 900
Castability = ALL_GROUND OWNED_CRTRS ALLIED_CRTRS BOUND_CRTRS
Artifact = SPELLBOOK_PROT
Properties =
PlayerState = PLAYER_STATE_ARMOUR
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
CastExpandFunc = general_expand
Spell = SPELL_ARMOUR
Expand All @@ -1748,7 +1752,7 @@ Cost = 100 200 300 400 500 600 700 800 900
Castability = ALL_GROUND OWNED_CRTRS ALLIED_CRTRS BOUND_CRTRS
Artifact = SPELLBOOK_CONCL
Properties =
PlayerState = PLAYER_STATE_CONCEAL
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
CastExpandFunc = general_expand
Spell = SPELL_INVISIBILITY
Expand All @@ -1768,7 +1772,7 @@ Cost = 7000 7200 7400 7600 7800 8000 8200 8400 9000
Castability = OWNED_GROUND ALLIED_GROUND ENEMY_CRTRS CUSTODY_CRTRS
Artifact = SPELLBOOK_DISEASE
Properties =
PlayerState = PLAYER_STATE_CASTDISEASE
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
CastExpandFunc = general_expand
Spell = SPELL_DISEASE
Expand All @@ -1789,7 +1793,7 @@ Duration = 10
Castability = OWNED_GROUND ALLIED_GROUND ENEMY_CRTRS CUSTODY_CRTRS
Artifact = SPELLBOOK_CHKN
Properties =
PlayerState = PLAYER_STATE_TURNCHICKEN
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
CastExpandFunc = general_expand
Spell = SPELL_CHICKEN
Expand All @@ -1809,7 +1813,7 @@ Cost = 10000 12000 14000 16000 18000 20000 22000 24000 26000
Castability = ALL_TALL CLAIMABLE
Artifact = SPELLBOOK_DWAL
Properties =
PlayerState = PLAYER_STATE_DESTROYWALLS
PlayerState = PLAYER_STATE_CAST_SUBTILE
ParentPower = NOPOWER
CastExpandFunc = general_expand
UseFunction = magic_use_power_destroy_walls
Expand All @@ -1820,7 +1824,7 @@ NameTextID = 645
TooltipTextID = 662
SymbolSprites = 552 550
PointerSprites = 182
PanelTabIndex = 18
PanelTabIndex = 31
SoundSamples = 0
SoundPlayed = 0
Power = 40 60 80 100 120 140 160 180 200 220
Expand All @@ -1829,7 +1833,7 @@ Cooldown = 30
Castability = ALL_GROUND ONLY_DIGGERS OWNED_CRTRS BOUND_CRTRS NEEDS_DELAY
Artifact = SPELLBOOK_TBMB
Properties =
PlayerState = PLAYER_STATE_TIMEBOMB
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
CastExpandFunc = general_expand
Spell = SPELL_TIME_BOMB
Expand All @@ -1849,7 +1853,7 @@ Cost = 0 0 0 0 0 0 0 0 0
Castability = ALL_GROUND OWNED_CRTRS OWNED_FOOD
Artifact = SPELLBOOK_POSS
Properties =
PlayerState = PLAYER_STATE_CTRLDIRECT
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
CastExpandFunc = do_not_expand
UseFunction = magic_use_power_possess_thing
Expand Down Expand Up @@ -1945,7 +1949,7 @@ Cost = 100 200 300 400 500 600 700 800 900
Castability = ALL_GROUND OWNED_CRTRS ALLIED_CRTRS BOUND_CRTRS
Artifact = SPELLBOOK_RBND
Properties =
PlayerState = PLAYER_STATE_REBOUND
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
; To have this power chargeable like other replace 'do_not_expand' with 'general_expand'.
CastExpandFunc = do_not_expand
Expand All @@ -1968,7 +1972,7 @@ Cooldown = 20
Castability = OWNED_GROUND ALLIED_GROUND UNCLMD_GROUND NEUTRL_GROUND ENEMY_CRTRS CUSTODY_CRTRS NEEDS_DELAY
Artifact = SPELLBOOK_FRZ
Properties =
PlayerState = PLAYER_STATE_FREEZE
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
; To have this power chargeable like other replace 'do_not_expand' with 'general_expand'.
CastExpandFunc = do_not_expand
Expand All @@ -1991,7 +1995,7 @@ Cost = 100 200 300 400 500 600 700 800 900
Castability = ALL_GROUND ENEMY_CRTRS CUSTODY_CRTRS
Artifact = SPELLBOOK_SLOW
Properties =
PlayerState = PLAYER_STATE_SLOW
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
; To have this power chargeable like other replace 'do_not_expand' with 'general_expand'.
CastExpandFunc = do_not_expand
Expand All @@ -2014,7 +2018,7 @@ Cost = 100 200 300 400 500 600 700 800 900
Castability = ALL_GROUND OWNED_CRTRS ALLIED_CRTRS BOUND_CRTRS
Artifact = SPELLBOOK_FLGT
Properties =
PlayerState = PLAYER_STATE_FLIGHT
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
; To have this power chargeable like other replace 'do_not_expand' with 'general_expand'.
CastExpandFunc = do_not_expand
Expand All @@ -2035,12 +2039,35 @@ Cost = 100 200 300 400 500 600 700 800 900
Castability = ALL_GROUND OWNED_CRTRS ALLIED_CRTRS BOUND_CRTRS
Artifact = SPELLBOOK_VSN
Properties =
PlayerState = PLAYER_STATE_VISION
PlayerState = PLAYER_STATE_CAST_ON_TARGET
ParentPower = NOPOWER
CastExpandFunc = general_expand
Spell = SPELL_SIGHT
UseFunction = magic_use_power_apply_spell

[power28]
Name = POWER_TUNNELLER
NameTextID = 1078
TooltipTextID = 1079
SymbolSprites = 811 809
PointerSprites = 344
PanelTabIndex = 18
SoundSamples = 0
SoundPlayed = 0
Cooldown = 35
Power = 0 0 1 1 2 2 3 3 4 9
Cost = 700 700 950 950 1150 1150 2100 2100 3000
; Becomes more expensive after every 7 units.
CostFormula = DWARF
Castability = OWNED_GROUND NEEDS_DELAY
Artifact = SPELLBOOK_TUNLR
Properties =
PlayerState = PLAYER_STATE_CREATEDIGGER
walt253 marked this conversation as resolved.
Show resolved Hide resolved
ParentPower = NOPOWER
CastExpandFunc = general_expand
UseFunction = magic_use_power_tunneller
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
View file
Open in desktop
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
Loading