diff --git a/games/peasant/NOTES b/games/peasant/NOTES index 6198f4e8..29df973b 100644 --- a/games/peasant/NOTES +++ b/games/peasant/NOTES @@ -163,3 +163,13 @@ right_masks: +POINTS IMPLEMENTED: (in order of implementation) ++ 10 (Talk Trogdor) ++ 1 (talk to archer) ++ 1 (talked to archer after trinket/mask) ++ 2 (move rock) ++ 1 (get pebbles) ++ 1 (get feed) ++ 5 (give riches) +====== + 21 points diff --git a/games/peasant/TODO b/games/peasant/TODO index 738a7b7f..4e122440 100644 --- a/games/peasant/TODO +++ b/games/peasant/TODO @@ -1,5 +1,6 @@ TODO: +is the letter K broken? map: fills in as you visit the areas @@ -108,15 +109,24 @@ Peasantry: - Ned - Kerrek2 + See Kerrek1 -- Lady Cottage +- Lady Cottage outside - Burnt trees +- Lady Cottage inside + + walk-to-shelf when get feed + + Rocking animation (both her there and not) + + Messages when leaving + - animation for the boat - animation of River - animation of waterfall - Hook up hidden glen, inside of cottages and inn - Archery minigame + + + + Tower: - Tower level diff --git a/games/peasant/graphics_inside/Makefile b/games/peasant/graphics_inside/Makefile index 6d1fc1a3..0df1499f 100644 --- a/games/peasant/graphics_inside/Makefile +++ b/games/peasant/graphics_inside/Makefile @@ -45,12 +45,19 @@ inside_nn.hgr: inside_nn.png ### priority_inside.inc: \ - todo_priority.lzsa + todo_priority.lzsa \ + inside_cottage_priority.lzsa echo "hidden_glen_priority_lzsa: .incbin \"todo_priority.lzsa\"" > priority_inside.inc - echo "inside_cottage_priority_lzsa: .incbin \"todo_priority.lzsa\"" >> priority_inside.inc + echo "inside_cottage_priority_lzsa: .incbin \"inside_cottage_priority.lzsa\"" >> priority_inside.inc echo "inside_nn_priority_lzsa: .incbin \"todo_priority.lzsa\"" >> priority_inside.inc +#### +inside_cottage_priority.lzsa: inside_cottage_priority.gr + $(LZSA) -r -f2 inside_cottage_priority.gr inside_cottage_priority.lzsa + +inside_cottage_priority.gr: inside_cottage_priority.png + $(PNG2GR) inside_cottage_priority.png inside_cottage_priority.gr #### diff --git a/games/peasant/graphics_inside/inside_cottage.png b/games/peasant/graphics_inside/inside_cottage.png index 5b9eec71..fc799758 100644 Binary files a/games/peasant/graphics_inside/inside_cottage.png and b/games/peasant/graphics_inside/inside_cottage.png differ diff --git a/games/peasant/graphics_inside/inside_cottage_priority.png b/games/peasant/graphics_inside/inside_cottage_priority.png new file mode 100644 index 00000000..a2b083e5 Binary files /dev/null and b/games/peasant/graphics_inside/inside_cottage_priority.png differ diff --git a/games/peasant/graphics_inside/prioity_inside_cottage.png b/games/peasant/graphics_inside/prioity_inside_cottage.png new file mode 100644 index 00000000..e0eab99a Binary files /dev/null and b/games/peasant/graphics_inside/prioity_inside_cottage.png differ diff --git a/games/peasant/inside.s b/games/peasant/inside.s index 0b55f287..390b159c 100644 --- a/games/peasant/inside.s +++ b/games/peasant/inside.s @@ -68,13 +68,11 @@ new_location: sbc #LOCATION_BASE tax -.if 0 lda verb_tables_low,X sta INL lda verb_tables_hi,X sta INH jsr load_custom_verb_table -.endif ;===================== ; load bg @@ -152,6 +150,64 @@ game_loop: jsr check_keyboard + ;===================== + ; level specific + ;===================== + + lda MAP_LOCATION + cmp #LOCATION_INSIDE_LADY + bne skip_level_specific + +inside_lady_cottage: + ; check if leaving + + lda PEASANT_Y + cmp #$95 + bcc skip_level_specific + + ; we're exiting, print proper message + + lda INVENTORY_2 + and #INV2_TRINKET + bne after_trinket_message + + lda INVENTORY_2_GONE + and #INV2_TRINKET + bne after_trinket_message + + +before_trinket_message: + ldx #inside_cottage_leaving_message + jsr finish_parse_message + jmp done_trinket_message + +after_trinket_message: + ldx #inside_cottage_leaving_post_trinket_message + jsr finish_parse_message + +done_trinket_message: + + ; put outside door + lda #$17 + sta PEASANT_X + lda #$7D + sta PEASANT_Y + + ; stop walking + lda #0 + sta PEASANT_XADD + sta PEASANT_YADD + + + ; move back + + lda #LOCATION_OUTSIDE_LADY + jsr update_map_location + +skip_level_specific: + lda LEVEL_OVER bmi oops_new_location bne level_over diff --git a/games/peasant/inside_actions.s b/games/peasant/inside_actions.s index a86bbdd6..8df1971b 100644 --- a/games/peasant/inside_actions.s +++ b/games/peasant/inside_actions.s @@ -148,79 +148,481 @@ hug_tree: ;======================= inside_cottage_verb_table: -.if 0 - .byte VERB_GET - .word puddle_get-1 - .byte VERB_TAKE - .word puddle_take-1 - .byte VERB_STEAL - .word puddle_steal-1 - .byte VERB_LOOK - .word puddle_look-1 -.endif - .byte 0 -.if 0 - ;================ - ; get - ;================ -puddle_get: -puddle_steal: -puddle_take: + .byte VERB_LOOK + .word inside_cottage_look-1 + .byte VERB_TALK + .word inside_cottage_talk-1 + .byte VERB_GET + .word inside_cottage_get-1 + .byte VERB_TAKE + .word inside_cottage_get-1 + .byte VERB_STEAL + .word inside_cottage_get-1 + .byte VERB_GIVE + .word inside_cottage_give-1 + .byte VERB_ASK + .word inside_cottage_ask-1 + .byte VERB_SLEEP + .word inside_cottage_sleep-1 + .byte 0 + + ;================= + ; give + ;================= + +inside_cottage_give: + lda CURRENT_NOUN - cmp #NOUN_ROCK - beq puddle_get_rock - cmp #NOUN_STONE - beq puddle_get_rock + cmp #NOUN_RICHES + beq inside_cottage_give_riches + cmp #NOUN_TRINKET + beq inside_cottage_give_trinket + + lda GAME_STATE_0 + and #LADY_GONE + bne default_nolady + + ldx #inside_cottage_give_default_message + jmp finish_parse_message + +default_nolady: + jmp parse_common_give + +inside_cottage_give_riches: + + lda INVENTORY_2_GONE + and #INV2_RICHES + bne inside_cottage_give_riches_already + + lda INVENTORY_2 + and #INV2_RICHES + beq inside_cottage_give_riches_notyet + + ; Give the riches + + ldx #inside_cottage_give_riches_message + jsr partial_message_step + + ; add 5 points to score + + lda #5 + jsr score_points + + ; get baby + + lda INVENTORY_1 + ora #INV1_BABY + sta INVENTORY_1 + + ldx #inside_cottage_give_riches2_message + jmp finish_parse_message - ; else "probably wish" message +inside_cottage_give_riches_notyet: + ldx #inside_cottage_give_riches_notyet_message + jmp finish_parse_message + +inside_cottage_give_riches_already: + ldx #inside_cottage_give_riches_already_message + jmp finish_parse_message + +inside_cottage_give_trinket: + + lda INVENTORY_2 + and #INV2_TRINKET + beq inside_cottage_give_trinket_nothave + + ; Give the trinket +inside_cottage_give_the_trinket: + ldx #inside_cottage_give_trinket_message + jmp finish_parse_message + + +inside_cottage_give_trinket_nothave: + lda GAME_STATE_0 + and #LADY_GONE + bne inside_cottage_give_trinket_nolady + + ldx #inside_cottage_give_trinket_nohave_message + jsr partial_message_step + + + ldx #inside_cottage_give_trinket_nohave2_message + jmp finish_parse_message + +inside_cottage_give_trinket_nolady: + ldx #inside_cottage_give_trinket_nolady_message + jmp finish_parse_message + + + + ;================= + ; get/take/steal + ;================= + +inside_cottage_get: + + lda CURRENT_NOUN + + cmp #NOUN_FEED + beq inside_cottage_get_feed + cmp #NOUN_BABY + beq inside_cottage_get_baby + cmp #NOUN_CHAIR + beq inside_cottage_get_chair + cmp #NOUN_GOLD + beq inside_cottage_get_gold + cmp #NOUN_MONEY + beq inside_cottage_get_gold + cmp #NOUN_HAY + beq inside_cottage_get_hay + cmp #NOUN_FOOD + beq inside_cottage_get_food + cmp #NOUN_STUFF + beq inside_cottage_get_food + cmp #NOUN_PILLOW + beq inside_cottage_get_pillow jmp parse_common_get -puddle_get_rock: - ldx #puddle_get_rock_message +inside_cottage_get_feed: + lda INVENTORY_1 + and #INV1_CHICKEN_FEED + bne inside_cottage_get_feed_already + + lda INVENTORY_1_GONE + and #INV1_CHICKEN_FEED + bne inside_cottage_get_feed_already + + ; get the feed + lda INVENTORY_1 + ora #INV1_CHICKEN_FEED + sta INVENTORY_1 + + ; add 1 point to score + + lda #1 + jsr score_points + + ldx #inside_cottage_get_feed_message + jmp finish_parse_message + +inside_cottage_get_feed_already: + ldx #inside_cottage_get_feed_already_message + jmp finish_parse_message + + +inside_cottage_get_baby: + lda GAME_STATE_0 + and #LADY_GONE + beq inside_cottage_get_baby_notgone + + jmp parse_common_get + +inside_cottage_get_baby_notgone: + + ldx #inside_cottage_get_baby_message + jmp finish_parse_message + +inside_cottage_get_chair: + lda GAME_STATE_0 + and #LADY_GONE + beq inside_cottage_get_chair_notgone + + ldx #inside_cottage_get_chair_gone_message + jmp finish_parse_message + +inside_cottage_get_chair_notgone: + + ldx #inside_cottage_get_chair_message + jmp finish_parse_message + +inside_cottage_get_gold: + ldx #inside_cottage_get_gold_message + jmp finish_parse_message + +inside_cottage_get_hay: + ldx #inside_cottage_get_hay_message + jmp finish_parse_message + +inside_cottage_get_food: + ldx #inside_cottage_get_food_message + jmp finish_parse_message + +inside_cottage_get_pillow: + ldx #inside_cottage_get_pillow_message + jmp finish_parse_message + + + ;================= + ; talk + ;================= + +inside_cottage_talk: + + lda CURRENT_NOUN + + cmp #NOUN_BABY + beq inside_cottage_talk_baby + cmp #NOUN_PEASANT + beq inside_cottage_talk_lady + cmp #NOUN_LADY + beq inside_cottage_talk_lady + cmp #NOUN_WOMAN + beq inside_cottage_talk_lady + cmp #NOUN_NONE + beq inside_cottage_talk_lady + + jmp parse_common_talk + +inside_cottage_talk_lady: + lda GAME_STATE_0 + and #LADY_GONE + bne inside_cottage_look_at_lady_gone + + ldx #inside_cottage_talk_lady_message + jsr partial_message_step + + ldx #inside_cottage_talk_lady2_message + jmp finish_parse_message + +inside_cottage_talk_lady_gone: + ldx #inside_cottage_talk_lady_gone_message + jmp finish_parse_message + +inside_cottage_talk_baby: + ldx #inside_cottage_talk_baby_message jmp finish_parse_message ;================= ; look ;================= -puddle_look: +inside_cottage_look: lda CURRENT_NOUN - cmp #NOUN_ROCK - beq puddle_look_at_rock - cmp #NOUN_STONE - beq puddle_look_at_rock - cmp #NOUN_MUD - beq puddle_look_at_mud - cmp #NOUN_PUDDLE - beq puddle_look_at_mud + cmp #NOUN_BABY + beq inside_cottage_look_at_baby + cmp #NOUN_CHAIR + beq inside_cottage_look_at_chair + cmp #NOUN_FEED + beq inside_cottage_look_at_feed + cmp #NOUN_HAY + beq inside_cottage_look_at_hay + cmp #NOUN_PEASANT + beq inside_cottage_look_at_lady + cmp #NOUN_LADY + beq inside_cottage_look_at_lady + cmp #NOUN_WOMAN + beq inside_cottage_look_at_lady + cmp #NOUN_PILLOW + beq inside_cottage_look_at_pillow + cmp #NOUN_SHELF + beq inside_cottage_look_at_shelf + cmp #NOUN_NONE - beq puddle_look_at + beq inside_cottage_look_at jmp parse_common_look -puddle_look_at: - ldx #puddle_look_at_message +inside_cottage_look_at_shelf: + ldx #inside_cottage_look_at_shelf_message jmp finish_parse_message -puddle_look_at_mud: - ldx #puddle_look_mud_message +inside_cottage_look_at_pillow: + ldx #inside_cottage_look_at_pillow_message jmp finish_parse_message -puddle_look_at_rock: - ldx #puddle_get_rock_message +inside_cottage_look_at_lady: + lda GAME_STATE_0 + and #LADY_GONE + bne inside_cottage_look_at_lady_gone + + ldx #inside_cottage_look_at_lady_message + jmp finish_parse_message + +inside_cottage_look_at_lady_gone: + ldx #inside_cottage_look_at_lady_gone_message + + jsr partial_message_step + + ldx #inside_cottage_look_at_lady_gone2_message + + jmp finish_parse_message + + +inside_cottage_look_at_hay: + ldx #inside_cottage_look_at_hay_message + jmp finish_parse_message + +inside_cottage_look_at_feed: + ldx #inside_cottage_look_at_feed_message + jmp finish_parse_message + +inside_cottage_look_at_chair: + ldx #inside_cottage_look_at_chair_message + jmp finish_parse_message + +inside_cottage_look_at_baby: + lda GAME_STATE_0 + and #LADY_GONE + beq inside_cottage_look_at_baby_there + + ; if baby/lady gone, call common code + jmp parse_common_look + +inside_cottage_look_at_baby_there: + + ldx #inside_cottage_look_at_baby_message + jmp finish_parse_message + +inside_cottage_look_at: + lda GAME_STATE_0 + and #LADY_GONE + bne inside_cottage_look_at_gone + + ldx #inside_cottage_look_at_message + jmp finish_parse_message + +inside_cottage_look_at_gone: + ldx #inside_cottage_look_at_gone_message + jmp finish_parse_message + + + ;================= + ; ask about + ;================= + +inside_cottage_ask: + + lda GAME_STATE_0 + and #LADY_GONE + beq inside_cottage_ask_lady + + jmp parse_common_ask + +inside_cottage_ask_lady: + lda CURRENT_NOUN + + cmp #NOUN_BABY + beq inside_cottage_ask_baby + cmp #NOUN_FIRE + beq inside_cottage_ask_fire + cmp #NOUN_JHONKA + beq inside_cottage_ask_jhonka + cmp #NOUN_NED + beq inside_cottage_ask_ned + cmp #NOUN_ROBE + beq inside_cottage_ask_robe + cmp #NOUN_SMELL + beq inside_cottage_ask_smell + cmp #NOUN_TROGDOR + beq inside_cottage_ask_trogdor + + ldx #inside_cottage_ask_unknown_message + jmp finish_parse_message + +inside_cottage_ask_baby: + ldx #inside_cottage_ask_baby_message + jmp finish_parse_message + +inside_cottage_ask_fire: + ldx #inside_cottage_ask_fire_message + jsr partial_message_step + + ldx #inside_cottage_ask_fire2_message + jsr partial_message_step + + ldx #inside_cottage_ask_fire3_message + jmp finish_parse_message + +inside_cottage_ask_jhonka: + ldx #inside_cottage_ask_jhonka_message + jsr partial_message_step + + ldx #inside_cottage_ask_jhonka2_message + jsr partial_message_step + + ldx #inside_cottage_ask_jhonka3_message + jmp finish_parse_message + +inside_cottage_ask_ned: + ldx #inside_cottage_ask_ned_message + jmp finish_parse_message + +inside_cottage_ask_robe: + ldx #inside_cottage_ask_robe_message + jmp finish_parse_message + +inside_cottage_ask_smell: + ldx #inside_cottage_ask_smell_message + jsr partial_message_step + + ldx #inside_cottage_ask_smell2_message + jmp finish_parse_message + +inside_cottage_ask_trogdor: + ldx #inside_cottage_ask_trogdor_message + jmp finish_parse_message + + ;================= + ; sleep + ;================= + +inside_cottage_sleep: + ldx #inside_cottage_sleep_message jmp finish_parse_message -.endif ;======================= ;======================= ;======================= diff --git a/games/peasant/parse_input.s b/games/peasant/parse_input.s index 830d3c27..67179615 100644 --- a/games/peasant/parse_input.s +++ b/games/peasant/parse_input.s @@ -922,6 +922,8 @@ noun_lookup: .byte "WINDOW",NOUN_WINDOW|$80 .byte "WISH",NOUN_WISH|$80 .byte "WOMAN",NOUN_WOMAN|$80 +.byte "GOLD",NOUN_GOLD|$80 +.byte "MONEY",NOUN_MONEY|$80 .byte $00 diff --git a/games/peasant/save2.s b/games/peasant/save2.s index 79cc506f..b4ab02f1 100644 --- a/games/peasant/save2.s +++ b/games/peasant/save2.s @@ -12,7 +12,7 @@ .byte 0 ; MAP_X = $94 .byte 0 ; MAP_Y = $95 .byte LOCATION_INSIDE_LADY; MAP_LOCATION = $96 -.byte $ff ; GAME_STATE_0 = $97 +.byte $00 ; GAME_STATE_0 = $97 .byte $00 ; GAME_STATE_1 = $98 .byte $00 ; GAME_STATE_2 = $99 .byte $00 ; NED_STATUS = $9A @@ -21,9 +21,9 @@ .byte $00 ; ARROW_SCORE = $9D .byte $01 ; SCORE_HUNDREDS= $9E .byte $09 ; SCORE_TENSONES= $9F -.byte $FF ; INVENTORY_1 = $A0 -.byte $FF ; INVENTORY_2 = $A1 -.byte $FF ; INVENTORY_3 = $A2 +.byte $00 ; INVENTORY_1 = $A0 +.byte $00 ; INVENTORY_2 = $A1 +.byte $00 ; INVENTORY_3 = $A2 .byte $00 ; INVENTORY_1_GONE = $A3 -.byte $FF ; INVENTORY_2_GONE_= $A4 +.byte $00 ; INVENTORY_2_GONE_= $A4 .byte $00 ; INVENTORY_3_GONE = $A5 diff --git a/games/peasant/talk/notes b/games/peasant/talk/notes index c07bf848..5489c189 100644 --- a/games/peasant/talk/notes +++ b/games/peasant/talk/notes @@ -52,6 +52,9 @@ Text VERB/NOUN parsing is more or less good enough could use object "PUT BABY IN WELL" a few places. cheat? + PUT PEBBLES IN WELL vs + PUT PEBBLES IN BUCKET vs + PUT BABY IN WELL Have to distinguish LOOK AT WELL/LOOK IN WELL how many verbs/nouns? diff --git a/games/peasant/text/inside.inc b/games/peasant/text/inside.inc index 3ea35b57..32f435d6 100644 --- a/games/peasant/text/inside.inc +++ b/games/peasant/text/inside.inc @@ -2,8 +2,6 @@ ; Hidden Glen ;================ -blah: - ; (Walk in the path of Dongolev's arrows) .byte "Hopefully this guy will have some sense and not shoot you.",0 ; {Dongolev shoots you in the head} @@ -67,6 +65,7 @@ blah: ;========================== ; + look +inside_cottage_look_at_message: .byte "What a depressing little",13 .byte "cottage. It reeks of single",13 .byte "parent. A lady rocks her",13 @@ -74,17 +73,26 @@ blah: .byte "empty shelf sits against",13 .byte "one wall.",0 -; + look (after lady leaves) +; + look (after lady leaves) +inside_cottage_look_at_gone_message: .byte "What a depressing little",13 .byte "cottage. It reeks of single",13 -.byte "parent. There is one of those self-rocking chairs. A mostly empty shelf sits against one wall.",0 +.byte "parent. There is one of",13 +.byte "those self-rocking chairs.",13 +.byte "A mostly empty shelf sits",13 +.byte "against one wall.",0 ; + look baby (lady there) +inside_cottage_look_at_baby_message: .byte "Peasant babies are pretty",13 .byte "freaking adorable. This",13 .byte "little guy's no exception.",0 +; + look baby (lady gone) +; calls the default you no-longer have an item code + ; + look chair +inside_cottage_look_at_chair_message: .byte "One of those self-rocking",13 .byte "kind. Not bad for a",13 .byte "brown-collar peasant-type.",13 @@ -92,33 +100,44 @@ blah: .byte "action.",0 ; + look feed +inside_cottage_look_at_feed_message: .byte "Cool Ranch. Your old",13 .byte "favorite.",0 ; + look hay +inside_cottage_look_at_hay_message: .byte "Hay is for horses!",0 ; + look lady/woman (while she's still there) +inside_cottage_look_at_lady_message: .byte "Typical pasty peasant",13 .byte "woman, overbearing and",13 .byte "judgemental. Obsessed",13 .byte "with goods and land.",0 ; + look lady/woman (after she's gone) -.byte "I can't believe you thought you had a chance with her!/Dork!",0 +inside_cottage_look_at_lady_gone_message: +.byte "I can't believe you thought",13 +.byte " you had a chance with her!",0 +inside_cottage_look_at_lady_gone2_message: +.byte "Dork!",0 ; + look pillow +inside_cottage_look_at_pillow_message: .byte "Swedish foam. Your",13 .byte "favorite.",0 ; + look shelf +inside_cottage_look_at_shelf_message: .byte "Nothing but a bag of",13 .byte "chicken feed.",0 ; + talk ; + talk lady WRONG IN WIKI +inside_cottage_talk_lady_message: .byte 34,"Hello, I'm-",34," you start but",13 .byte "the lady cuts you off.",0 +inside_cottage_talk_lady2_message: .byte 34,"Okay, here's why I let you",13 .byte "in here,",34," she explains. ",34,"My",13 .byte "husband got squished by",13 @@ -130,16 +149,24 @@ blah: .byte "I'll give you something",13 .byte "great.",0 -; + talk baby (before you get the baby) +; + talk lady (after she's gone) +inside_cottage_talk_lady_gone_message: +.byte "You'd call out her name and",13 +.byte "let it ring through the",13 +.byte "empty room, enveloping you",13 +.byte "in sorrow, but you don't",13 +.byte "actually know her name.",0 + +; + talk baby (before you get the baby) (Also after (bug?)) +inside_cottage_talk_baby_message: .byte "You say some cute, stupid",13 .byte "stuff and the baby just",13 .byte "blows snot bubbles.",0 -; + talk lady (after she's gone) -.byte "You'd call out her name and let it ring through the empty room, enveloping you in sorrow, but you don't actually know her name.",0 ; +1 POINT! ; + get/take/steal chicken feed [walks you to it] +inside_cottage_get_feed_message: .byte "You used to eat this stuff",13 .byte "like crazy when you were a",13 .byte "kid and your parents",13 @@ -149,30 +176,110 @@ blah: .byte "handfuls.",0 ; + get feed (after taking) WIKI IS WRONG +inside_cottage_get_feed_already_message: .byte "You don't need any more. It",13 .byte "might give rise to old",13 .byte "temptations.",0 ; + get baby (while she still has it) WIKI IS WRONG +inside_cottage_get_baby_message: .byte 34,"You wanna to be a part of",13 .byte "this family? GO GET US",13 .byte "THOSE RICHES!!",34," she",13 .byte "shrieks.",0 ; + get chair (while she is there) +inside_cottage_get_chair_message: .byte "No. There's a big bag of",13 .byte "something in it. Oh, that's",13 .byte "the baby lady.",0 ; + get chair (after she is gone) +inside_cottage_get_chair_gone_message: .byte "No. Too big for pants.",0 -; +5 POINTS +; + get gold/money +inside_cottage_get_gold_message: +.byte "Um, that's chicken feed.",0 + +; + get hay +inside_cottage_get_hay_message: +.byte "There's a huge bale a",13 +.byte "couple of screens over from",13 +.byte "here. Why bother stealing?",0 + +; + get stuff/food +inside_cottage_get_food_message: +.byte "Which foodstuffs?",0 + +; + get pillow +inside_cottage_get_pillow_message: +.byte "You don't have anywhere to",13 +.byte "use it and it is rather",13 +.byte "bulky, so you leave it.",0 + +; +5 POINTS, get baby ; + give riches -.byte 34,"My riches!!",34," she screams and snatches up every last gold coin. ",34,"Thanks, sucker! Here you go!",34," she shoves the baby into your hands and bolts out the door.",0 -.byte "You later learn that she does this all the time and is wanted throughout the countryside. Those riches probably WERE the Jhonka's and who knows whose baby that is. Well, it's yours now.",0 +inside_cottage_give_riches_message: +.byte 34,"My riches!!",34," she screams",13 +.byte "and snatches up every last",13 +.byte "gold coin. ",34,"Thanks,",13 +.byte "sucker! Here you go!",34," she",13 +.byte "shoves the baby into your",13 +.byte "hands and bolts out the door.",0 + +inside_cottage_give_riches2_message: +.byte "You later learn that she",13 +.byte "does this all the time and",13 +.byte "is wanted throughout the",13 +.byte "countryside. Those riches",13 +.byte "probably WERE the Jhonka's",13 +.byte "and who knows whose baby",13 +.byte "that is. Well, it's yours",13 +.byte "now.",0 + +; + give riches (before getting the riches) +inside_cottage_give_riches_notyet_message: +.byte 34,"That's right,",34," she",13 +.byte "whines. ",34,"Find my riches,",13 +.byte "and give here.",34,0 + +; + give riches (after giving the riches) +inside_cottage_give_riches_already_message: +.byte "We did that already, and it",13 +.byte "was sort of humiliating.",0 + +; + give trinket +inside_cottage_give_trinket_message: +.byte 34,"Did you find that thing in",13 +.byte "my yard?",34," she asks. ",34,"I got",13 +.byte "that thing free in a box of",13 +.byte "Plaguezees. I need some FOR",13 +.byte "REAL riches!",34,0 + +; + give trinket (after giving trinket to Mendelev) +inside_cottage_give_trinket_nohave_message: +.byte 34,"Why are you holding your",13 +.byte "hand out?",34," she asks. ",34,"I",13 +.byte "told you I need riches, so",13 +.byte "I can't give em away.",34,0 +inside_cottage_give_trinket_nohave2_message: +.byte "You don't have a trinket to",13 +.byte "give, you realize.",0 + +; + give trinket (after she's gone) WIKI is WRONG +inside_cottage_give_trinket_nolady_message: +.byte "She's done left you. And",13 +.byte "she ain't coming back. No",13 +.byte "how. no never.",0 + +; + give (anything not listed) +inside_cottage_give_default_message: +.byte 34,"We don't need that mess,",34,13 +.byte "she says.",0 ; + ask about baby +inside_cottage_ask_baby_message: .byte 34,"This little guy's all I",13 .byte "got left. If only someone",13 .byte "would steal back all our",13 @@ -180,97 +287,82 @@ blah: .byte "filthy Jhonka.",34,0 ; + ask about fire ; WIKI IS WRONG +inside_cottage_ask_fire_message: .byte 34,"You need fire? A couple of",13 .byte "trees over near the",13 .byte "waterfall used to be on",13 .byte "fire. But now there's like",13 -.byte "a signal lantern over there or",13 -.byte "something.",34,0 +.byte "a signal lantern over there",13 +.byte "or something.",34,0 + +inside_cottage_ask_fire2_message: .byte 34,"So should I ask that",13 .byte "signal lantern?",34," you ask.",0 + +inside_cottage_ask_fire3_message: .byte 34,"I dunno man! Whattaya want",13 .byte "from me?",34,0 ; + ask about Jhonka +inside_cottage_ask_jhonka_message: .byte 34,"That nasty thing killed my",13 .byte "husband and took my",13 .byte "riches!!",34,0 + +inside_cottage_ask_jhonka2_message: .byte 34,"I thought Trogdor killed",13 .byte "your husband,",34," you",13 .byte "interject.",0 + +inside_cottage_ask_jhonka3_message: .byte 34,"Oh right. Yeah. That's",13 .byte "what I said. Trogband",13 .byte "killed my husbdor.",34,0 ; + ask about naked ned +inside_cottage_ask_ned_message: .byte 34,"Don't talk about that",13 .byte "pervert in front of the",13 -.byte " baby here.",34,0 +.byte "baby here.",34,0 ; + ask about robe +inside_cottage_ask_robe_message: .byte 34,"You can't have mine,",13 .byte "pervert! I'm not a nudist",13 .byte "peasant like that weirdo",13 .byte "over in west Peasantry!",34,0 ; + ask about smell +inside_cottage_ask_smell_message: .byte 34,"What smells is junior",13 -.byte "here's drawers! I gotta",13 -.byte "quit feeding him so much horse.",34,0 +.byte "here's drawers! I gotta quit",13 +.byte "feeding him so much horse.",34,0 + +inside_cottage_ask_smell2_message: .byte 34,"And don't start asking me",13 .byte "for his diapers, sicko!",34,0 ; + ask about trogdor -.byte "I hope you kill that",13 +inside_cottage_ask_trogdor_message: +.byte 34,"I hope you kill that",13 .byte "stupid dragon. My 'Wives of",13 .byte "Squished Peasants' support",13 .byte "group would bake you a Poor",13 .byte "Gary pie if you did.",34,0 ; + ask about (unknown) +inside_cottage_ask_unknown_message: .byte 34,"I dunno what you're",13 .byte "talking about.",34,0 ; + sleep +inside_cottage_sleep_message: .byte "That's probably how the",13 .byte "first baby got here. Forget",13 .byte "it.",0 -; + get gold/money -.byte "Um, that's chicken feed.",0 - -; + get hay -.byte "There's a huge bale a",13 -.byte "couple of screens over from",13 -.byte "here. Why bother stealing?",0 - -; + get stuff/food -.byte "Which foodstuffs?",0 - -; + get pillow -.byte "You don't have anywhere to",13 -.byte "use it and it is rather",13 -.byte "bulky, so you leave it.",0 - -; + give (anything not listed) -.byte 34,"We don't need that mess,",34,13 -.byte "she says.",0 - -; + give trinket -.byte "'Did you find that thing in my yard?' she asks. 'I got that thing free in a box of Plaguezees. I need some FOR REAL riches!'",0 - -; + give trinket (after giving trinket to Mendelev) -.byte "'Why are you holding your hand out?' she asks. 'I told you I need riches, so I can't give em away.' You don't have a trinket to give, you realize.",0 - -; + give riches (after giving the riches) -.byte "We did that already, and it was sort of humiliating.",0 - -; + give riches (before getting the riches) -.byte 34,"That's right,",34," she",13 -.byte "whines. ",34,"Find my riches,",13 -.byte "and give here.",34,0 - -; + (leaving) [check if this is different before you talk to her] +; + (leaving) +inside_cottage_leaving_message: .byte "The baby lady calls after",13 .byte "you, ",34,"Hey, you're on some",13 .byte "quest right? Well, the",13 @@ -279,7 +371,8 @@ blah: .byte "yard the other day. It's",13 .byte "yours if you can find it.",34,0 -; + (leaving after she's gone) +; + (leaving after you got trinket) +inside_cottage_leaving_post_trinket_message: .byte "This place is dead anyway.",0 diff --git a/games/peasant/tokens.inc b/games/peasant/tokens.inc index 95148d97..33f39080 100644 --- a/games/peasant/tokens.inc +++ b/games/peasant/tokens.inc @@ -183,5 +183,7 @@ NOUN_IN_WELL = 102 NOUN_BUCKET = 103 NOUN_WISH = 104 NOUN_ARMS = 105 +NOUN_GOLD = 106 +NOUN_MONEY = 107 ; -NOUN_UNKNOWN = 106 +NOUN_UNKNOWN = 108