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

Fixes4AK #3599

Merged
merged 3 commits into from
Oct 28, 2024
Merged

Fixes4AK #3599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f25164
Fixes4AK
walt253 Oct 27, 2024
b200b5a
GoldPerHoard = 2250
walt253 Oct 28, 2024
70ee04e
Merge branch 'dkfans:master' into Fixes4AK
walt253 Oct 28, 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
3 changes: 3 additions & 0 deletions campgns/ancntkpr/map00019.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ REM ********************************************
COMPUTER_PLAYER(PLAYER1,0)
COMPUTER_PLAYER(PLAYER2,0)

SET_COMPUTER_PROCESS(PLAYER1,"DIG TO CLOSE GOLD",0,30999,144000,1,1)
SET_COMPUTER_PROCESS(PLAYER2,"DIG TO CLOSE GOLD",0,30999,144000,1,1)

DISPLAY_OBJECTIVE(105,PLAYER0)
DISPLAY_INFORMATION(107,PLAYER0)

Expand Down
3 changes: 2 additions & 1 deletion campgns/dzjr06lv_crtr/demonspawn.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ Defence = 50
Luck = 8
Recovery = 5
HungerRate = 0
HungerFill = 0
; In the original game, you could force-feed creatures even if they did not have any needs for eating. Setting HungerFill to 1 while HungerRate is set to 0 enables this mechanic.
HungerFill = 1
LairSize = 1
HurtByLava = 0
BaseSpeed = 56
Expand Down
3 changes: 2 additions & 1 deletion campgns/dzjr06lv_crtr/ghost.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ Defence = 250
Luck = 10
Recovery = 10
HungerRate = 0
HungerFill = 0
; In the original game, you could force-feed creatures even if they did not have any needs for eating. Setting HungerFill to 1 while HungerRate is set to 0 enables this mechanic.
HungerFill = 1
HurtByLava = 2
BaseSpeed = 56
Size = 200 512
Expand Down
3 changes: 2 additions & 1 deletion campgns/dzjr06lv_crtr/skeleton.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ Defence = 40
Luck = 2
Recovery = 24
HungerRate = 0
HungerFill = 0
; In the original game, you could force-feed creatures even if they did not have any needs for eating. Setting HungerFill to 1 while HungerRate is set to 0 enables this mechanic.
HungerFill = 1
LairSize = 1
HurtByLava = 2
BaseSpeed = 72
Expand Down
2 changes: 2 additions & 0 deletions campgns/postanck/map00191.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ REM
REM ********************************************

COMPUTER_PLAYER(PLAYER1,1)
SET_COMPUTER_EVENT(PLAYER1,"EVENT ENEMY DOOR",144000,41,2500,2,0)

START_MONEY(PLAYER1,10000)
MAX_CREATURES(PLAYER1,40)
ADD_CREATURE_TO_POOL(ORC,9)
Expand Down
8 changes: 8 additions & 0 deletions levels/legacy_cfgs/magic.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Name = SHOT_LIGHTNING
BaseExperienceGain = 256
Properties = REBOUND_IMMUNE WIND_IMMUNE FIXED_DAMAGE

[shot11]
Name = SHOT_GRENADE
WithstandHitAgainst = WALL DOOR LAVA WATER

[shot12]
Name = SHOT_DRAIN
BaseExperienceGain = 256
Expand All @@ -25,6 +29,10 @@ Properties =
Name = SHOT_BOULDER
Health = 210

[shot30]
Name = SHOT_WORD_OF_POWER
AreaDamage = 5 150 150

[spell21]
Name = SPELL_SIGHT
SpellPower = POWER_SIGHT
Expand Down
1 change: 1 addition & 0 deletions levels/legacy_cfgs/rules.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
; Note that it is partial config file - do not replace global config with this file.

[game]
GoldPerHoard = 2250
DungeonHeartHealHealth = 1
PreserveClassicBugs = RESURRECT_FOREVER OVERFLOW_8BIT CLAIM_ROOM_ALL_THINGS RESURRECT_REMOVED NO_HAND_PURGE_ON_DEFEAT MUST_OBEY_KEEPS_NOT_DO_JOBS BREAK_NEUTRAL_WALLS ALWAYS_TUNNEL_TO_RED FULLY_HAPPY_WITH_GOLD FAINTED_IMMUNE_TO_BOULDER REBIRTH_KEEPS_SPELLS STUN_FRIENDLY_UNITS PASSIVE_NEUTRALS NEUTRAL_TORTURE_CONVERTS
MapCreatureLimit = 255
Expand Down
2 changes: 2 additions & 0 deletions levels/legacy_crtr/ghost.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Name = GHOST
FearStronger = 10000
Defence = 60
Luck = 4
; In the original game, you could force-feed creatures even if they did not have any needs for eating. Setting HungerFill to 1 while HungerRate is set to 0 enables this mechanic.
HungerFill = 1
Properties = IMMUNE_TO_GAS FLYING SEE_INVISIBLE EVIL

[experience]
Expand Down
2 changes: 2 additions & 0 deletions levels/legacy_crtr/skeleton.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
Name = SKELETON
Defence = 50
Luck = 1
; In the original game, you could force-feed creatures even if they did not have any needs for eating. Setting HungerFill to 1 while HungerRate is set to 0 enables this mechanic.
HungerFill = 1

[jobs]
PrimaryJobs = TRAIN
Expand Down
2 changes: 1 addition & 1 deletion src/creature_states_gardn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ TbBool creature_able_to_eat(const struct Thing *creatng)
struct CreatureStats* crstat = creature_stats_get_from_thing(creatng);
if (creature_stats_invalid(crstat))
return false;
return ((crstat->hunger_rate > 0) && (crstat->hunger_fill > 0));
return ((crstat->hunger_rate > 0) || (crstat->hunger_fill > 0));
}

TbBool hunger_is_creature_hungry(const struct Thing *creatng)
Expand Down
Loading