1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-24 13:27:17 +00:00
Commit Graph

418 Commits

Author SHA1 Message Date
Zeno Rogue
3a4e84effe Orb of the Sword in non-shmup 3D geometries 2019-09-12 22:50:08 +02:00
Zeno Rogue
9bec1bc96e CR4 achievement should be fixed 2019-09-12 22:50:07 +02:00
Zeno Rogue
c7620974a1 easier Chaos Mode + Inv 2019-09-12 22:50:06 +02:00
Zeno Rogue
7ce26fd5ec Hunting Grounds in >4-valent tilings 2019-09-12 22:50:05 +02:00
Zeno Rogue
25cbf1129b fixed ambushes in non-three-valent geometries 2019-09-12 22:50:05 +02:00
Zeno Rogue
5110a29d4d dual:: cshpos fixup to save all 2019-09-12 22:50:04 +02:00
Zeno Rogue
7d086da036 removed some junk 2019-09-12 22:50:04 +02:00
Zeno Rogue
381f5015c9 dual:: no Orb of Safety power (game cannot be saved) 2019-09-12 22:50:04 +02:00
Zeno Rogue
c3586308fa dual:: you can now swing at unkillable monsters 2019-09-12 22:50:04 +02:00
Zeno Rogue
5e05a0db61 dual:: if there is no effect, do no move rather than double swing 2019-09-12 22:50:04 +02:00
Zeno Rogue
e99896be06 dual:: disabled gameover for now 2019-09-12 22:50:04 +02:00
Zeno Rogue
9561e348a1 dual:: glance message 2019-09-12 22:50:04 +02:00
Zeno Rogue
b7daf93f2e dual:: movement orbs are replaced with Speed 2019-09-12 22:50:03 +02:00
Zeno Rogue
6467e38537 recallCell now remembers orientation (is cellwalker) 2019-09-12 22:50:03 +02:00
Zeno Rogue
8295251cdc multigame support, including dualmode 2019-09-12 22:50:03 +02:00
Zeno Rogue
13a044154b sword:: accurate sword angles 2019-09-12 22:50:03 +02:00
Zeno Rogue
2b1aebb9b4 chaosmode variants (CLI only for now) 2019-09-12 22:50:03 +02:00
Zeno Rogue
b6e303ec7d MAJOR refactoring: all geometry-dependent data (tessf, geom3::, shapes, hpc) are now contained in a structure 2019-09-12 22:50:03 +02:00
Zeno Rogue
53ecff6c00 Thumpers activated by Bulls are no longer permanent 2019-09-12 22:50:01 +02:00
Zeno Rogue
8c2b717223 monster orientation is now modelled in non-orientable geometries 2019-09-12 22:50:00 +02:00
Zeno Rogue
5353a82ebf Terracotta Warriors now turn into slimes when slimed 2019-09-12 22:50:00 +02:00
Zeno Rogue
3bad1aebae push cursor did not appear in the hardcore mode or while having targettable orbs 2019-09-12 22:50:00 +02:00
Zeno Rogue
df3e21b310 debug cleanup 2019-09-12 22:50:00 +02:00
Zeno Rogue
1c4d86e0e9 3D graphics in 2D (first commit) 2019-09-12 22:43:01 +02:00
Zeno Rogue
6253c6c3e3 redone gravity in shmup 2019-09-12 22:43:01 +02:00
Zeno Rogue
f98448464a renamed shmup::safety to delayed_safety to prevent confusion 2019-09-12 22:43:00 +02:00
Zeno Rogue
f507b7cf55 fixed Orb of the Warp destroyed while refactoring 2019-09-12 22:42:59 +02:00
Zeno Rogue
ddf43101b2 some flavor messages no longer display in special modes if they are inappropriate for them 2019-09-12 22:42:59 +02:00
Zeno Rogue
f90e1001e3 refactored native and landUnlocked into content.cpp 2019-09-12 22:42:59 +02:00
Zeno Rogue
14b32ced68 auto-charged teleport in bounded minefield 2019-09-12 22:42:59 +02:00
Zeno Rogue
039118425c 3D:: alternate minefield adjacency rule 2019-09-12 22:42:59 +02:00
Zeno Rogue
9b7ad345a9 mine adjacency rule can be changed (in 2D for now) 2019-09-12 22:42:59 +02:00
Zeno Rogue
52305eb830 fixed thumper-to-water/chasm counters 2019-09-12 22:42:59 +02:00
Zeno Rogue
e762fcab2e fixed fire in Brownian 2019-09-12 22:42:59 +02:00
Zeno Rogue
743af3217d the magic of Orb of Yendor makes them immobile using boats 2019-09-12 22:42:58 +02:00
Zeno Rogue
05ee76015f a better message on illegal moves in Brown Island 2019-09-12 22:42:58 +02:00
Zeno Rogue
f5d08e34fd bulls rage when pushed 2019-09-12 22:42:58 +02:00
Zeno Rogue
f9ba041451 asteroids:: theming, changed look to invisible floors + grid, provided validity rules 2019-09-12 22:42:58 +02:00
Zeno Rogue
57f2891826 bounded Minefield now works according to the standard Minesweeper rules 2019-09-12 22:42:58 +02:00
Zeno Rogue
5356eba11c Asteroids 2019-09-12 22:42:58 +02:00
Zeno Rogue
75fff87366 moveghosts no longer stops completely if one of the ghosts is stunned 2019-09-12 22:38:47 +02:00
Zeno Rogue
fbf73cd66b better cellEdgeUnstable rule in 3D 2019-09-12 22:38:47 +02:00
Zeno Rogue
02a174b3ca item/monster/wall/land types done with X-macros; flags given too 2019-09-12 22:38:47 +02:00
Zeno Rogue
0e10dec9e2 added some exports to hyper.h and rogueviz.h 2019-09-12 22:38:46 +02:00
Zeno Rogue
f0092d9633 3d:: vision-based gamerange in shmup 2019-09-12 22:38:45 +02:00
Zeno Rogue
52ce5ac9aa 3d:: all the regular honeycombs 2019-09-12 22:38:43 +02:00
Zeno Rogue
b5c7df4b11 3d:: getHemisphere works nicely; disabled wall removing in sphere3 crossroads 2019-09-12 22:38:43 +02:00
Zeno Rogue
a52755bf50 some fixes due to weird action in git 2019-09-12 22:38:43 +02:00
?
42e4342c4a 3d:: fixed pushing directions 2019-09-12 22:38:42 +02:00
?
111bc3697d sword:: removed the dependence on the S* constants 2019-09-12 22:38:42 +02:00
?
f37c8d2f1c more elegant airdir 2019-09-12 22:38:42 +02:00
?
31037574f5 CAP_COMPLEX2 first 2019-09-12 22:38:39 +02:00
?
c5a771c888 CAP_FIELD part 1 2019-09-12 22:38:39 +02:00
?
b25730d5c9 geometry flags part 1 2019-09-12 22:38:39 +02:00
Zeno Rogue
bf732ff89f fixed a bug with pushing thumpers into fire traps. 2019-09-12 22:38:39 +02:00
Zeno Rogue
c80df92acb text fixes, PL translation updated 2019-09-12 22:38:39 +02:00
Zeno Rogue
47e43f974c no more trolls leaving walls in freefall 2019-09-12 22:38:39 +02:00
Zeno Rogue
4564a0203c Brownian shows elevation in the help line 2019-09-12 22:38:39 +02:00
Zeno Rogue
102292fdc6 fixed the walls generated by Bronze Beasts outside of Brown Islands 2019-09-12 22:38:39 +02:00
Zeno Rogue
b4025d375c Bronze Bugs are stunned also when pushed into water 2019-09-12 22:38:39 +02:00
Zeno Rogue
df73ccb4c2 splashing sounds when pushing things into water/chasms; barrels produce permanent walls 2019-09-12 22:38:39 +02:00
Zeno Rogue
d982407d5a secondary attacks cause the barrels to explode 2019-09-12 22:38:39 +02:00
Zeno Rogue
d64ce588d2 clicking sounds for traps 2019-09-12 22:38:38 +02:00
Zeno Rogue
eab0369ce9 shmup:: features of the new lands work 2019-09-12 22:38:38 +02:00
Zeno Rogue
cded55423b no more pushing statues on arrow/fire traps 2019-09-12 22:38:38 +02:00
Zeno Rogue
ebe75cdd62 renamed itOrbBrown to itOrbIntensity 2019-09-12 22:38:38 +02:00
Zeno Rogue
d944f3cb43 newlands:: explosive barrels are now attacked by pikemen and blue raiders 2019-04-29 17:19:06 +02:00
Zeno Rogue
fd3f762a30 westwall:: no West treasures close to the wall 2019-04-29 17:19:06 +02:00
Zeno Rogue
30c4d798db newlands:: fixed Orb of Choice 2019-04-29 17:19:06 +02:00
Zeno Rogue
8a414d1768 westwall:: monster theme 2019-04-29 17:19:06 +02:00
Zeno Rogue
2bc66342dd newlands:: implemented new Orbs: Gravity, Intensity, Choice 2019-04-29 17:19:06 +02:00
Zeno Rogue
9d82cea995 westwall:: Yendor Quest in the West Wall 2019-04-29 17:19:06 +02:00
Zeno Rogue
6d392ce07e westwall:: initial commit 2019-04-29 17:19:06 +02:00
Zeno Rogue
724d3516fa variant:: first version 2019-04-29 17:19:05 +02:00
Zeno Rogue
bf23d42e4c racing:: more arrangements 2019-04-29 17:19:05 +02:00
Zeno Rogue
410c05554c racing:: fixed some lands for racing 2019-04-29 17:19:05 +02:00
Zeno Rogue
74ad8ea135 brownian:: more serious work 2019-04-29 17:19:05 +02:00
?
162542b616 parts pushed too fast 2019-02-08 17:39:46 +01:00
Zeno Rogue
92d98847fb fixed the issue with Orb of Aether being marked as used due to Minefield uncovering 2019-02-06 18:48:53 +01:00
Zeno Rogue
35043b5528 tortoise flags are now editable with Shift+G and saved into saved levels 2019-02-06 18:48:53 +01:00
Zeno Rogue
b751fa56c6 no more ambushes on compasses (matters in HG) 2019-02-06 18:48:52 +01:00
Zeno Rogue
846032ece2 Blue Raiders now can destroy boats 2019-02-06 18:48:52 +01:00
Zeno Rogue
213cd2febf Orb of Empathy works correctly with Orb of the Fish now 2019-02-06 18:48:52 +01:00
Zeno Rogue
6ca2768641 reduced the range of Fire Cultists to 2 if getDistLimit() < 4 2019-02-06 18:48:49 +01:00
Zeno Rogue
5e7920784f Orb of Winter now protects your boat from destruction 2019-02-06 18:48:36 +01:00
Zeno Rogue
24b8bcaf5e roar message now uses the correct number of kills instead of 20 2019-02-06 18:48:36 +01:00
Zeno Rogue
af95a20b43 bugfix: gadfly kills no longer counted twice 2019-02-06 16:39:40 +01:00
Zeno Rogue
f22ec08f86 Warnings when hitting an ally. Better warnings 2018-12-14 19:30:54 +01:00
Zeno Rogue
207df51b8a crystal:: pirates no longer drop confusing Compasses 2018-12-14 19:27:12 +01:00
Zeno Rogue
9e3e4cf7a5 crystal:: more lands 2018-12-14 19:27:12 +01:00
Zeno Rogue
46256155d7 crystal:: compass generation 2018-12-14 19:27:12 +01:00
Zeno Rogue
79e396c742 crystal:: computing Round Table sizes (not tested) 2018-12-14 19:27:12 +01:00
Zeno Rogue
9b6136fb41 fixed some bugs where euclid was used instead of eubinary 2018-12-14 19:27:11 +01:00
Zeno Rogue
90c024822e makeEmpty in Wild West no longer destroys nearby Great Walls 2018-12-11 22:10:53 +01:00
Zeno Rogue
3e87d463d2 fixed the 'special conduct' help in the Haunted Woods 2018-11-11 11:27:36 +01:00
Zeno Rogue
6ec7023501 fixed the crash in Wild West 2018-10-28 03:09:07 +01:00
Zeno Rogue
5fac74b1cb fixed graphical/movement glitches in the minimal quotient space 2018-09-23 16:34:53 +02:00
Zeno Rogue
98e96a20c3 better distribution in hrand and hrandf 2018-09-23 16:34:53 +02:00
Zeno Rogue
9bf8842124 expansion is now computed exactly and for most geometries 2018-09-12 04:23:15 +02:00
Zeno Rogue
6de0f0a8aa instead of nonbitrunc, gp::on and irr::on, there is one variable, variation 2018-08-28 17:17:34 +02:00
Zeno Rogue
7cdf1a353f improved mirrors in various geometries 2018-08-21 15:37:59 +02:00
Zeno Rogue
cd91148459 arcm:: all patterns work 2018-08-20 15:24:44 +02:00
Zeno Rogue
1a6427ba32 some arrays had number bounds while it should have been MAX_EDGE 2018-08-18 17:37:12 +02:00
Zeno Rogue
682f804576 major rewrite: unified the common parts of heptagon and cell via struct connection<T> and struct walker<T> 2018-08-18 00:46:45 +02:00
Zeno Rogue
4f3cc3783a binary tiling 2018-08-09 19:28:53 +02:00
Zeno Rogue
508cecb3b3 the cost of leaving Land of Power now happens before collecting items 2018-08-01 14:04:47 +02:00
Zeno Rogue
1aafd72cd8 fixed a checkmate rule bug with Pikeman and (potentially killed) monster on the way 2018-08-01 12:40:44 +02:00
Zeno Rogue
b3d074161e killing a tortoise with a saved baby now kills the baby too 2018-07-30 09:51:57 +02:00
Zeno Rogue
39e131d985 no more petrification on Round Table 2018-07-30 09:34:48 +02:00
Zeno Rogue
e557dd1303 fixed a crash bug with the 'mark' command when no cell active 2018-07-23 23:35:01 +02:00
Zeno Rogue
f7e5f470dc irr:: celldist and (circular, not yet horocyclic) celldistAlt 2018-07-20 02:58:47 +02:00
Zeno Rogue
a91195bda1 bugfix: Raging Bull / Orb of the Bull / Orb of Horns worked correctly only on hexagons and heptagonsm 2018-07-10 21:51:28 +02:00
Zeno Rogue
508c63d731 calls to rogueviz::mark and rogueviz::fixparam from HR main are now replaced by hooks 2018-07-09 18:59:12 +02:00
Arthur O'Dwyer
f10f5a29b2 Fix a couple of issues in MSVC related to min and max.
MSVC apparently thinks that the result of arithmetic promotions
on an `unsigned:4` bitfield is `unsigned`, not `int`; which then
causes it to fail to deduce whether the `T` in `min<T>` should be
`unsigned` (the type of the LHS) or `int` (the type of the RHS).
Clang and GCC agree that the result of arithmetic promotions on
an `unsigned:4` bitfield should be `int`, so they don't see any
ambiguity here.
2018-07-08 22:19:30 -07:00
Arthur O'Dwyer
eac2ce1168 Tweak this weird hack for the benefit of MSVC.
MSVC wrongly complains about the old version:

    game.cpp(6802): error C2664: 'std::pair<hr::cell *,hr::eItem> std::make_pair<hr::cell*&,hr::eItem&>(_Ty1,_Ty2)':
    cannot convert argument 2 from 'hr::eItem' to 'hr::eItem &'
        with
        [
            _Ty1=hr::cell *&,
            _Ty2=hr::eItem &
        ]

And MSVC wrongly complains about this alternative:

    conformal::findhistory.emplace_back(c2, int(c2->item));
    error: no matching function for call to 'std::pair<hr::cell*, hr::eItem>::pair(hr::cell*&, int)'

And MinGW wrongly complains about these alternatives:

    game.cpp:6801:49: error: cannot bind bitfield 'c2->hr::cell::<anonymous>.hr::gcell::item' to 'hr::eItem&'
     conformal::findhistory.emplace_back(c2, c2->item);
                                             ~~~~^~~~

    game.cpp:6801:47: error: cannot bind bitfield 'c2->hr::cell::<anonymous>.hr::gcell::item' to 'hr::eItem&'
     conformal::findhistory.push_back({c2, c2->item});
                                           ~~~~^~~~
2018-07-08 22:19:20 -07:00
Zeno Rogue
8b35bf6d4b shards collectable in laMirrorOld 2018-07-07 11:04:44 +02:00
Zeno Rogue
a8c55be1d1 Orb of Water + Orb of Empathy no longer works on enemies too 2018-07-03 04:22:35 +02:00
Zeno Rogue
11d9d3de5a renamed the global variable r to hrngen; added a commentr about hrngen; fixed hrandom_shuffle in rogueviz-kohonen 2018-06-30 16:29:37 +02:00
Arthur O'Dwyer
1a93fbcd45 Stop using the deprecated std::random_shuffle, for the benefit of MSVC.
And generalize `hrandom_shuffle` to take an arbitrary `Iter`,
so that passing `vec.begin()` will work even with MSVC's
debug iterators. (Passing `&vec[0]` or `vec.data()` would work
either way, but I'd worry that someone would forget to do that
conscientiously every time.)
2018-06-29 14:20:03 -07:00
Zeno Rogue
941982be98 [10.3i] fixed gaining extra bullets in the Wild West 2018-06-29 13:15:44 +02:00
Zeno Rogue
0f4de1fa9a [10.3i] fixed shooting in the Wild West 2018-06-29 13:14:49 +02:00
Zeno Rogue
53e9cb3ca5 fixed a crash introduced in 10.4h 2018-06-29 12:29:23 +02:00
Zeno Rogue
f1f1098d95 removed some remaining references to sval, fixed the compilation of RogueViz 2018-06-29 12:16:35 +02:00
Zeno Rogue
b01cee20d5 fixed one more bug with pathdata 2018-06-28 14:56:12 +02:00
Zeno Rogue
5e891cf66e fixed the uninitialized variable warnings 2018-06-28 14:30:34 +02:00
Zeno Rogue
92240a0eeb fixed the missing message when picking up orbs from a boat 2018-06-28 13:35:15 +02:00
Zeno Rogue
cf8dffd6b8 fixed bugs with manual celllisters 2018-06-28 13:35:03 +02:00
Zeno Rogue
d11044a80a refactoring: sval/aitmp is no more, celllister(manual) used instead 2018-06-28 12:59:35 +02:00
Zeno Rogue
c6412511f5 fixed a bug in leader movement by using pathdist; also made pathdist more robust 2018-06-28 11:42:25 +02:00
Zeno Rogue
2d6f7d4ed0 five-kill achievement now also counts the 'basic' kill 2018-06-28 10:40:02 +02:00
Zeno Rogue
dd9723dc00 Orb of Freedom is now checked after the Terracotta Warriors 2018-06-28 10:39:35 +02:00
Zeno Rogue
b042a457cc non-player multikills are no longer counted for achievements 2018-06-28 10:39:15 +02:00
Zeno Rogue
87dc7dcd62 renamed the global variable 'which' to 'who_kills_me' for clarity and bug prevention (would be better still to remove it) 2018-06-26 00:56:46 +02:00
Zeno Rogue
92aba5c95b fixed a bug with arrow traps not killing anything (and possibly some other cases) 2018-06-24 01:18:39 +02:00
Zeno Rogue
63869c6d33 renamed the size function to isize 2018-06-22 14:47:24 +02:00
Zeno Rogue
8f8a259992 new quotient geometries 2018-06-22 01:48:46 +02:00
Zeno Rogue
529befd359 no more ambushes when summoning orbs in the Hunting Grounds 2018-06-18 17:48:27 +02:00
Zeno Rogue
d3200253db replacing with an explicit list 2018-06-17 18:32:06 +02:00
Zeno Rogue
35301f0a68 movement animations now work in quotient geometries 2018-06-17 17:51:26 +02:00
Zeno Rogue
95a2f617cf Rock Snakes from the Snake Nest now keep their colors in other lands 2018-06-17 12:15:46 +02:00
Zeno Rogue
c0266a7164 renamed 'near' to 'isnear' ('near' is a non-standard keyword) 2018-06-13 00:42:27 +02:00
Zeno Rogue
50eaba3efd changes from zenorogue/hyperrogue#27 2018-06-12 22:40:06 +02:00
Zeno Rogue
520e5e5dbb pass lambdas to functions by reference, not by value zenorogue/hyperrogue#25 2018-06-12 22:17:08 +02:00
Zeno Rogue
75b096c58d conflicts resolved 2018-06-12 21:57:00 +02:00
Zeno Rogue
78e817c70b
Merge pull request #28 from Quuxplusone/thumper-and-boat
Pushing a thumper through a boat is no longer allowed.
2018-06-12 21:43:31 +02:00
Zeno Rogue
a2ec40537d Hunter dogs (guarding/regrouping) and sometimes wolves no longer count as a different kill type (not counted in total kills) 2018-06-12 21:13:59 +02:00
Zeno Rogue
8f183b7afb Orb of Love no longer incresaes the displayed score in the Strange Challenge 2018-06-12 18:26:20 +02:00
Zeno Rogue
c5468db000 fixed some issues with adjacency taken into account incorrectly with Hedgehogs/Flailguards/Pikemen and Warp/halfvines 2018-06-12 16:05:39 +02:00
Zeno Rogue
fc23c64c5e orb of Horns, and other cases caring about opposite cells, now work correctly in nonstandard geometries 2018-06-12 16:04:33 +02:00
Zeno Rogue
cc5909e999 fixed the Earth Elementals falling/dying in RRV 2018-06-11 18:43:13 +02:00