Skip to content

Commit

Permalink
Merge pull request #489 from issid/trap
Browse files Browse the repository at this point in the history
implementation of displaying rsm objects in the world
  • Loading branch information
MrAntares authored Oct 8, 2024
2 parents b30868a + 7aafcfa commit f49f3d5
Show file tree
Hide file tree
Showing 6 changed files with 595 additions and 285 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
/Online.js
/StrViewer.js
/ThreadEventHandler.js
/data/*

# IDE files
.idea/
Expand Down
14 changes: 7 additions & 7 deletions src/DB/Effects/EffectTable.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* DB/Effects/EffectTable.js
* @module DB/Effects/EffectTable
*
* List effects
* TODO: complete the list, add informations about sound.
Expand Down Expand Up @@ -4024,7 +4024,7 @@ define(function( require )
//229: [{}], //EF_CLOUD (Nothing)
//230: [{}], //EF_CLOUD2 (Nothing)
//231: [{}], //EF_MAPPILLAR Map Light Pillar Animation 1

232: [{ //EF_LINELINK Sacrifice (Visual Effect)
type: '3D',
alphaMax: 0.5,
Expand All @@ -4046,7 +4046,7 @@ define(function( require )
zOffset: 1,
zIndex: 1
}],

//233: [{}], //EF_CLOUD3 Fog

234: [{ //EF_SPELLBREAKER Spell Breaker
Expand Down Expand Up @@ -4781,7 +4781,7 @@ define(function( require )
}
}
}],

296: [{ //EF_TALK_SCREAM Scream
type: 'FUNC',
attachedEntity: true,
Expand All @@ -4798,7 +4798,7 @@ define(function( require )
}
}
}],

//297: [{}], //EF_POKJUK Fire Works (Visual Effect)

298: [{ //EF_THROWITEM Acid Terror Animnation
Expand Down Expand Up @@ -11529,8 +11529,8 @@ define(function( require )
}],

'ef_oldtrap_default': [{
type: 'SPR',
file: '\xb1\xe2\xba\xbb\xc6\xae\xb7\xa6',
type: 'RSM',
file: '\xbf\xdc\xba\xce\xbc\xd2\xc7\xb0\x5c\xc6\xae\xb7\xa6\x30\x31',
attachedEntity: true,
}],

Expand Down
Loading

0 comments on commit f49f3d5

Please sign in to comment.