Overview
Comment: | Remove Transform and add CollisionLayers and fix some other names. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
68ea2a92ca91e4a4e40d13056cc36d78 |
User & Date: | user on 2020-12-04 02:08:57 |
Other Links: | manifest | tags |
Context
2020-12-04
| ||
06:07 | Implement many more opcodes and correct a few check-in: 9aed95654b user: user tags: trunk | |
02:08 | Remove Transform and add CollisionLayers and fix some other names. check-in: 68ea2a92ca user: user tags: trunk | |
2020-12-02
| ||
21:08 | Implement the Send instruction and its variants check-in: b58b5e017d user: user tags: trunk | |
Changes
Modified instruc from [38f6970dd1] to [3180b06075].
︙ | ︙ | |||
159 160 161 162 163 164 165 166 167 168 169 170 171 172 | ,=UserState ,=VisualOnly ,=Stealthy ,=Moved ,Destroyed ,Player ,Compatible Self Msg From =Arg1 =Arg2 =Arg3 MoveNumber | > | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 | ,=UserState ,=VisualOnly ,=Stealthy ,=Moved ,Destroyed ,Player ,Compatible ,CollisionLayers Self Msg From =Arg1 =Arg2 =Arg3 MoveNumber |
︙ | ︙ | |||
221 222 223 224 225 226 227 | *PopUpArgs ; for (PopUp [number]) QueueTurn ; queue another turn that automatically occurs after this one .,Send .,SendEx ; send with three arguments SetInventory Sound Trace | < | 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 | *PopUpArgs ; for (PopUp [number]) QueueTurn ; queue another turn that automatically occurs after this one .,Send .,SendEx ; send with three arguments SetInventory Sound Trace VolumeAt WinLevel ,XDir ,YDir ; Specials *Function *Local *Label *String *Int16 *Int32 |
Modified instruc.h from [f3d6a8eac9] to [c6d452b30e].
︙ | ︙ | |||
238 239 240 241 242 243 244 | #define OP_MOVED_EC 39008 #define OP_DESTROYED 32865 #define OP_DESTROYED_C 34913 #define OP_PLAYER 32866 #define OP_PLAYER_C 34914 #define OP_COMPATIBLE 32867 #define OP_COMPATIBLE_C 34915 | > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < < | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 | #define OP_MOVED_EC 39008 #define OP_DESTROYED 32865 #define OP_DESTROYED_C 34913 #define OP_PLAYER 32866 #define OP_PLAYER_C 34914 #define OP_COMPATIBLE 32867 #define OP_COMPATIBLE_C 34915 #define OP_COLLISIONLAYERS 32868 #define OP_COLLISIONLAYERS_C 34916 #define OP_SELF 32869 #define OP_MSG 32870 #define OP_FROM 32871 #define OP_ARG1 32872 #define OP_ARG1_E 36968 #define OP_ARG2 32873 #define OP_ARG2_E 36969 #define OP_ARG3 32874 #define OP_ARG3_E 36970 #define OP_MOVENUMBER 32875 #define OP_LEVEL 32876 #define OP_KEY 32877 #define OP_BACKGROUND 32878 #define OP_INPUT 32879 #define OP_QUIZ 32880 #define OP_INPLACE 32881 #define OP_DEFAULTIMAGE 32882 #define OP_HELP 32883 #define OP_EDITORHELP 32884 #define OP_SUBS 32885 #define OP_ANIMATE 32886 #define OP_ASSASSINATE 32887 #define OP_ASSASSINATE_C 34935 #define OP_BROADCAST 32888 #define OP_BROADCAST_D 41080 #define OP_BROADCASTCLASS 32889 #define OP_BROADCASTEX 32890 #define OP_BROADCASTEX_D 41082 #define OP_BROADCASTSUM 32891 #define OP_BROADCASTSUMEX 32892 #define OP_CREATE 32893 #define OP_CREATE_D 41085 #define OP_DELINVENTORY 32894 #define OP_DELTA 32895 #define OP_DESTROY 32896 #define OP_DESTROY_C 34944 #define OP_DESTROY_D 41088 #define OP_DESTROY_CD 43136 #define OP_FLUSHCLASS 32897 #define OP_FLUSHOBJ 32898 #define OP_GETINVENTORY 32899 #define OP_HEIGHTAT 32900 #define OP_IGNOREKEY 32901 #define OP_INTMOVE 32902 #define OP_INTMOVE_C 34950 #define OP_INTMOVE_D 41094 #define OP_INTMOVE_CD 43142 #define OP_JUMPTO 32903 #define OP_JUMPTO_C 34951 #define OP_JUMPTO_D 41095 #define OP_JUMPTO_CD 43143 #define OP_LOC 32904 #define OP_LOC_C 34952 #define OP_LOCATEME 32905 #define OP_LOSELEVEL 32906 #define OP_MAXINVENTORY 32907 #define OP_MOVE 32908 #define OP_MOVE_C 34956 #define OP_MOVE_D 41100 #define OP_MOVE_CD 43148 #define OP_MOVEPLUS 32909 #define OP_MOVEPLUS_C 34957 #define OP_MOVEPLUS_D 41101 #define OP_MOVEPLUS_CD 43149 #define OP_MOVETO 32910 #define OP_MOVETO_C 34958 #define OP_MOVETO_D 41102 #define OP_MOVETO_CD 43150 #define OP_NEWX 32911 #define OP_NEWY 32912 #define OP_OBJABOVE 32913 #define OP_OBJABOVE_C 34961 #define OP_OBJBELOW 32914 #define OP_OBJBELOW_C 34962 #define OP_OBJBOTTOMAT 32915 #define OP_OBJCLASSAT 32916 #define OP_OBJDIR 32917 #define OP_OBJDIR_C 34965 #define OP_OBJTOPAT 32918 #define OP_POPUP 32919 #define OP_POPUPARGS 32920 #define OP_QUEUETURN 32921 #define OP_SEND 32922 #define OP_SEND_C 34970 #define OP_SEND_D 41114 #define OP_SEND_CD 43162 #define OP_SENDEX 32923 #define OP_SENDEX_C 34971 #define OP_SENDEX_D 41115 #define OP_SENDEX_CD 43163 #define OP_SETINVENTORY 32924 #define OP_SOUND 32925 #define OP_TRACE 32926 #define OP_VOLUMEAT 32927 #define OP_WINLEVEL 32928 #define OP_XDIR 32929 #define OP_XDIR_C 34977 #define OP_YDIR 32930 #define OP_YDIR_C 34978 #define OP_FUNCTION 32931 |
︙ | ︙ | |||
354 355 356 357 358 359 360 | {"*",8486933}, {"+",8421395}, {"-",8421396}, {".",10518528}, {"/",8486934}, {"ANHH",8389394}, {"ARRIVED",8389124}, | | | | | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < < | < | 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 | {"*",8486933}, {"+",8421395}, {"-",8421396}, {".",10518528}, {"/",8486934}, {"ANHH",8389394}, {"ARRIVED",8389124}, {"Animate",8421494}, {"Arg1",8552552}, {"Arg2",8552553}, {"Arg3",8552554}, {"Arrivals",8618071}, {"Arrived",8618069}, {"Assassinate",8487031}, {"B",9437196}, {"BANG",8389380}, {"BEDOINGNG",8389406}, {"BEEDEEP",8389404}, {"BEGIN_TURN",8389123}, {"BIZARRO_SWAP",8389143}, {"BOOOM",8389410}, {"BOUNCE",8389415}, {"BRRREEET",8389396}, {"BRRRT",8389395}, {"BUZZER",8389420}, {"BWEEP",8389397}, {"Background",8683630}, {"Broadcast",10518648}, {"BroadcastEx",10518650}, {"BroadcastSum",8421499}, {"BroadcastSumEx",8421500}, {"Busy",8618073}, {"CHEEP",8389393}, {"CHYEW",8389392}, {"CLEANUP",8389140}, {"CLICK",8389388}, {"COLLIDE",8389142}, {"COLLIDEBY",8389141}, {"CREATE",8389121}, {"CREATED",8389137}, {"Class",8486955}, {"Climb",9142335}, {"CollisionLayers",8487012}, {"Compatible",8487011}, {"Create",10518653}, {"DEEP_POP",8389417}, {"DEPARTED",8389125}, {"DESTROY",8389122}, {"DESTROYED",8389136}, {"DINK",8389390}, {"DOOR",8389378}, {"DRLRLRINK",8389398}, {"DYUPE",8389413}, {"DefaultImage",8683634}, {"DelInventory",8421502}, {"Delta",8421503}, {"Density",9142327}, {"Departed",8618070}, {"Departures",8618072}, {"Destroy",10584192}, {"Destroyed",8487009}, {"Dir",8618033}, {"Distance",9142325}, {"E",9437184}, {"END_TURN",8389139}, {"EditorHelp",8683636}, {"F",9437192}, {"FAROUT",8389421}, {"FFFFTT",8389399}, {"FLOATED",8389132}, {"FROG",8389383}, {"FlushClass",8421505}, {"FlushObj",8421506}, {"From",8421479}, {"GLASS",8389379}, {"GLISSANT",8389419}, {"GetInventory",8421507}, {"HAWK",8389425}, {"HEARTBEAT",8389407}, {"HIT",8389134}, {"HITBY",8389135}, {"Hard",8618051}, {"Height",9142333}, {"HeightAt",8421508}, {"Help",8683635}, {"INIT",8389120}, {"IgnoreKey",8421509}, {"Image",8618034}, {"InPlace",8683633}, {"Inertia",9142323}, {"Input",8683631}, {"IntMove",10584198}, {"Invisible",8618074}, {"JAYAYAYNG",8389416}, {"JUMPED",8389128}, {"JumpTo",10584199}, {"KEWEL",8389422}, {"KEY",8389129}, {"KLECK",8389387}, {"KLINKK",8389385}, {"Key",8421485}, {"KeyCleared",8618075}, {"L",9437194}, {"LASTIMAGE",8389126}, {"LB",9437195}, {"LF",9437193}, {"LOCK",8389408}, {"LOOP",8388610}, {"Level",8421484}, {"Loc",8487048}, {"LocateMe",8421513}, {"LoseLevel",8421514}, {"MOVED",8389127}, {"MOVING",8389130}, {"MaxInventory",8421515}, {"Misc1",9142343}, {"Misc2",9142345}, {"Misc3",9142347}, {"Misc4",9142349}, {"Misc5",9142351}, {"Misc6",9142353}, {"Misc7",9142355}, {"Move",10584204}, {"Move+",10584205}, {"MoveNumber",8421483}, {"MoveTo",10584206}, {"Moved",8618080}, {"Msg",8421478}, {"N",9437186}, {"NE",9437185}, {"NW",9437187}, {"NewX",8421519}, {"NewY",8421520}, {"OLDPHONE",8389402}, {"ONCE",8388609}, {"OSC",8388616}, {"OSCLOOP",8388618}, {"ObjAbove",8487057}, {"ObjBelow",8487058}, {"ObjBottomAt",8421523}, {"ObjClassAt",8421524}, {"ObjDir",8487061}, {"ObjTopAt",8421526}, {"PLAYERMOVING",8389133}, {"POSTINIT",8389138}, {"POUR",8389377}, {"POWER",8389386}, {"Player",8487010}, {"PopUp",8421527}, {"QueueTurn",8421529}, {"Quiz",8683632}, {"R",9437198}, {"RATCHET1",8389418}, {"RATCHET2",8389412}, {"RATTLE",8389403}, {"RB",9437197}, {"RF",9437199}, {"S",9437190}, {"SE",9437191}, {"SMALL_POP",8389389}, {"SPLASH",8389376}, {"STEAM",8389424}, {"STOP",8388608}, {"SUBS",8683637}, {"SUNK",8389131}, {"SW",9437189}, {"Self",8421477}, {"Send",10584218}, {"SendEx",10584219}, {"SetInventory",8421532}, {"Shape",8618030}, {"ShapeDir",8618053}, {"Sharp",8618052}, {"Shovable",8618054}, {"Sound",8421533}, {"Stealthy",8618079}, {"Strength",9142337}, {"TAHTASHH",8389409}, {"THMP_thmp",8389405}, {"THWIT",8389384}, {"TICK",8389391}, {"Temperature",9142316}, {"Trace",8421534}, {"UH_OH",8389382}, {"UNCORK",8389414}, {"UNHH",8389381}, {"UserSignal",8618076}, {"UserState",8618077}, {"VACUUM",8389411}, {"VisualOnly",8618078}, |
︙ | ︙ | |||
620 621 622 623 624 625 626 | {"rsh",8486938}, {"swap",8421378}, {"then",8683527}, {"tuck",8421380}, {"until",8683531}, {"while",8683532}, }; | | | 618 619 620 621 622 623 624 625 626 | {"rsh",8486938}, {"swap",8421378}, {"then",8683527}, {"tuck",8421380}, {"until",8683531}, {"while",8683532}, }; #define N_OP_NAMES 270 #endif |
Modified names.h from [1fdff19683] to [af89837265].
︙ | ︙ | |||
16 17 18 19 20 21 22 | #define MSG_HIT 14 #define MSG_HITBY 15 #define MSG_DESTROYED 16 #define MSG_CREATED 17 #define MSG_POSTINIT 18 #define MSG_END_TURN 19 #define MSG_CLEANUP 20 | | < < | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | #define MSG_HIT 14 #define MSG_HITBY 15 #define MSG_DESTROYED 16 #define MSG_CREATED 17 #define MSG_POSTINIT 18 #define MSG_END_TURN 19 #define MSG_CLEANUP 20 #define MSG_COLLIDEBY 21 #define MSG_COLLIDE 22 #define MSG_BIZARRO_SWAP 23 #ifdef HEROMESH_MAIN const char*const standard_message_names[]={ "INIT", "CREATE", "DESTROY", "BEGIN_TURN", "ARRIVED", |
︙ | ︙ | |||
44 45 46 47 48 49 50 | "HIT", "HITBY", "DESTROYED", "CREATED", "POSTINIT", "END_TURN", "CLEANUP", | | < < | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | "HIT", "HITBY", "DESTROYED", "CREATED", "POSTINIT", "END_TURN", "CLEANUP", "COLLIDEBY", "COLLIDE", "BIZARRO_SWAP", }; #endif #define SND_SPLASH 0 #define SND_POUR 1 #define SND_DOOR 2 #define SND_GLASS 3 #define SND_BANG 4 |
︙ | ︙ |
Modified names.js from [f2de6d4d8c] to [d593430889].
︙ | ︙ | |||
21 22 23 24 25 26 27 | 15 = HITBY 16 = DESTROYED 17 = CREATED 18 = POSTINIT 19 = END_TURN // New 20 = CLEANUP | | < < | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | 15 = HITBY 16 = DESTROYED 17 = CREATED 18 = POSTINIT 19 = END_TURN // New 20 = CLEANUP 21 = COLLIDEBY 22 = COLLIDE 23 = BIZARRO_SWAP `.split("\n").map(x=>/^ *([0-9]+) = ([^ ]*) *$/.exec(x)).filter(x=>x); const standard_sound_names=[]; ` SPLASH POUR DOOR GLASS |
︙ | ︙ |