Skip to content

Commit

Permalink
Restored PR #1255: Spellflags fix reorganization
Browse files Browse the repository at this point in the history
  • Loading branch information
cbnolok committed Aug 7, 2024
1 parent 4ea4325 commit 405db0b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
*.old
*.tmp
*.pid
*.swp*
*.*swp*
*.fuse*

*.o
Expand All @@ -45,6 +45,7 @@
*.vcxproj
*.sln
*.user
*.*project
*.*workspace
*.kdev*

Expand Down
10 changes: 8 additions & 2 deletions Changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3464,7 +3464,7 @@ Additionally, the problem of zig-zag issue following in the South direction has
- Added: New Layer LAYER_STORAGE (80) to let scripters create their own storage system. (Issue: #1209)
Only t_container and t_container_locked can be equipped to this layer.
- Changed: Decay time removed from spawned items, as Sphere gives tons of invalid link errors when items decayed. (Issue: #1218)
- Added: New spellflag SPELLFLAG_FIELD_RANDOMDECAY (0100000000) to randomize field timers like old sphere versions. (Issue: #1169)
- Added: New spellflag SPELLFLAG_FIELD_RANDOMDECAY (CHANGED on 06/08/2024: 02000, it was before 0100000000) to randomize field timers like old sphere versions. (Issue: #1169)
SPELLFLAG_FIELD_RANDOMDECAY should be added to defs.
- Changed: SERV.LOG command changed to support console colors. (Issue: [Feature Request] Colored Serv & Src Log System #1158)
SERV.LOG works same as before.
Expand Down Expand Up @@ -3568,7 +3568,7 @@ Additionally, the problem of zig-zag issue following in the South direction has

08-04-2024, xwerswoodx
- Fixed: Missing REGION reference for multis. (Issue: #1228)
- Added: SPELLFLAG_NO_ELEMENTALENGINE (0200000000) as spellflag, for ignoring Elemental Engine Damages in specific spells. (Issue: #1230)
- Added: SPELLFLAG_NO_ELEMENTALENGINE (CHANGED on 06/08/2024: 04000, it was before 0200000000) as spellflag, for ignoring Elemental Engine Damages in specific spells. (Issue: #1230)

09-04-2024, xwerswoodx
- Fixed: An issue that causes T_MULTI_CUSTOM keep multi count saved. (Issue: #1232)
Expand Down Expand Up @@ -3802,3 +3802,9 @@ Added: 'H' shortcut for variables to get the value as hexadecimal.

20-07-2024, Nolok
- Changed: When trying to set/modify a STAT to reach a value < 0, print an error and default that stat to 0. Nevertheless, remember to check for underflows or overflows in your scripts before passing the value to the core! This update is a safety net but you can expect bugs anyways if you don't check the math in the scripts.

06-08-2024, Gladie
- Fixed: changed value of some recent spellflags, since the previous values waere too big to be stored in a standard numerical variable.
New values:
SPELLFLAG_FIELD_RANDOMDECAY 02000
SPELLFLAG_NO_ELEMENTALENGINE 04000
4 changes: 2 additions & 2 deletions lib/libev/configure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ find_library ( HAVE_LIBRT rt )
# Tweaks
set ( HAVE_CLOCK_SYSCALL ${HAVE_CLOCK_GETTIME} )

CONFIGURE_FILE ("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
"${CMAKE_CURRENT_SOURCE_DIR}/libev/config.h" )
CONFIGURE_FILE ("${CMAKE_CURRENT_LIST_DIR}/config.h.in"
"${CMAKE_CURRENT_LIST_DIR}/libev/config.h" )

message (STATUS "Done.")
4 changes: 2 additions & 2 deletions src/game/game_macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ typedef dword DAMAGE_TYPE; // describe a type of damage.
#define SPELLFLAG_FIELD 0x0000080 // create a field of stuff. (fire,poison,wall)
#define SPELLFLAG_SUMMON 0x0000100 // summon a creature.
#define SPELLFLAG_GOOD 0x0000200 // The spell is a good spell. u intend to help to receiver.
#define SPELLFLAG_RESIST 0x0000400 // Allowed to resist this.
#define SPELLFLAG_RESIST 0x0000400 // Allowed to resist this.
#define SPELLFLAG_TARG_NOSELF 0x0000800
#define SPELLFLAG_FREEZEONCAST 0x0001000 // freezes the char on cast for this spell.
#define SPELLFLAG_FIELD_RANDOMDECAY 0x0002000 // Make the field items have random timers.
Expand All @@ -100,7 +100,7 @@ typedef dword DAMAGE_TYPE; // describe a type of damage.
#define SPELLFLAG_NOPRECAST 0x0400000 // disable precasting for this spell
#define SPELLFLAG_NOFREEZEONCAST 0x0800000 // disable freeze on cast for this spell
#define SPELLFLAG_AREA 0x1000000 // area effect (uses local.arearadius)
#define SPELLFLAG_POLY 0x2000000
#define SPELLFLAG_POLY 0x2000000
#define SPELLFLAG_TARG_DEAD 0x4000000 // Allowed to targ dead chars
#define SPELLFLAG_DAMAGE 0x8000000 // Damage intended
#define SPELLFLAG_BLESS 0x10000000 // Benefitial spells like Bless,Agility,etc.
Expand Down

0 comments on commit 405db0b

Please sign in to comment.