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

feat: add the simple wishable dinos #998

Merged
merged 6 commits into from
Aug 20, 2022
Merged

feat: add the simple wishable dinos #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3b952c4
feat: add the simple wishable dinos
midgleyc Aug 19, 2022
52f8552
feat: add kachungasaur
midgleyc Aug 19, 2022
d43ba86
Merge branch 'main' into wishable-dinos
Veracity0 Aug 19, 2022
c4c2f16
Merge branch 'main' into wishable-dinos
Veracity0 Aug 20, 2022
9a06a1a
fix: ghostasaurus is undead and has a spooky attack
midgleyc Aug 20, 2022
8f8b2b2
fix: properly quote article error
midgleyc Aug 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/data/monsters.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,6 +1351,18 @@ The Big Ignatowicz 2218 firethedude.gif BOSS NOCOPY Atk: 250 Def: 225 HP: 2000 I
The Man on Fire 2219 firetheman.gif BOSS NOCOPY Atk: 250 Def: 225 HP: 2000 Init: 60 P: dude E: hot really dense meat stack (100)
The Naughty Scorcheress 2220 sorcform1.gif BOSS NOCOPY Atk: 190 Def: 171 HP: 400 Init: 10000 P: dude ED: hot Article: The Instant Karma (c100) Thwaitgold maggot statuette (n100)

# Fall of the Dinosaurs

Veracity0 marked this conversation as resolved.
Show resolved Hide resolved
kachungasaur 2230 dino_kachung.gif Atk: 0 Def: 0 HP: 0 Init: -10000 P: beast Article: a
dilophosaur 2231 dino_diplo.gif Atk: 0 Def: 0 HP: 0 Init: -10000 P: beast Article: a
high-altitude pterodactyl 2232 dino_ptero.gif Atk: 0 Def: 0 HP: 0 Init: -10000 P: beast Article: a
glass-shelled archelon 2233 dino_turtle.gif Atk: 0 Def: 0 HP: 0 Init: -10000 P: beast Article: a
supersonic velociraptor 2234 dino_raptor.gif Atk: 0 Def: 0 HP: 0 Init: -10000 P: beast Article: a
spikolodon 2235 dino_spike.gif Atk: 0 Def: 0 HP: 0 Init: -10000 P: beast Article: a
ghostasaurus 2236 dino_ghost.gif Atk: 0 Def: 0 HP: 0 Init: -10000 P: undead EA: spooky Article: a
flatusaurus 2237 dino_flat.gif Atk: 0 Def: 0 HP: 0 Init: -10000 P: beast Article: a
primitive chicken 2238 dino_chicken.gif Atk: 0 Def: 0 HP: 0 Init: -10000 P: beast Article: a

# Items of the Month

# Bad Trip (Astral Badger June 2006)
Expand Down
2 changes: 1 addition & 1 deletion src/net/sourceforge/kolmafia/session/MonsterManuelManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public static MonsterData registerMonster(final int id, final String text) {
+ id
+ ") has article '"
+ article
+ ", but KoLmafia says it is "
+ "', but KoLmafia says it is '"
+ monster.getArticle()
+ "'");
}
Expand Down