From: Harishankar Date: Sun, 9 Oct 2011 09:44:02 +0000 (+0530) Subject: Most graphics related updates X-Git-Url: https://harishankar.org/repos/?a=commitdiff_plain;h=93544bdd97d65c88d0bc4b3f74f43f9689fb3918;p=butaba-adventures.git Most graphics related updates Mostly updates related to graphics and level data. --- diff --git a/background/tileset.png b/background/tileset.png index a7f28f7..d951e58 100644 Binary files a/background/tileset.png and b/background/tileset.png differ diff --git a/dialogues/bulisa5.dlg b/dialogues/bulisa5.dlg new file mode 100644 index 0000000..1d4cc8b --- /dev/null +++ b/dialogues/bulisa5.dlg @@ -0,0 +1,24 @@ + + + + Hello, Butaba! So, what's up? + Things are fine! + I am still looking for something to do + Bye! + + + That's good. I hope you had luck with that job... + No such luck! Still looking + Bye! + + + Ah, then I think I can put you on to something. You see, the town mayor is collecting money for charity. There is + going to be a gala function during the Fete. He's short handed at the moment, looking for volunteers. Maybe you could help! + Sounds like a good idea. I'll go meet him. + Oh, I'll consider it... + + + No problem. It's a good cause. Hope you can help with that! + Bye! + + \ No newline at end of file diff --git a/gamestate.py b/gamestate.py index cdf54ca..6a7e4ad 100644 --- a/gamestate.py +++ b/gamestate.py @@ -1,9 +1,13 @@ # game state switches and variables # this is used to control the game state -# Bulisa initial mission +flag = {} +# Bulisa initial mission # drawing water from well mission -mission_bulisa_water_from_well = False -mission_bulisa_water_from_well_complete = False -mission_bulisa_water_from_well_refused = False +flag["mission_bulisa_water_from_well"] = False +flag["mission_bulisa_water_from_well_complete"] = False +flag["mission_bulisa_water_from_well_refused"] = False + +# mission to collect money for charity +flag["mission_charity_money"] = False diff --git a/levels/level1.dat b/levels/level1.dat index a8101c8..2deb753 100644 --- a/levels/level1.dat +++ b/levels/level1.dat @@ -189,12 +189,12 @@ I3 aI10 aI0 aa(lp53 -I3 -aI10 +I8 +aI0 aI0 aa(lp54 -I3 -aI10 +I8 +aI1 aI0 aa(lp55 I3 @@ -230,12 +230,12 @@ I3 aI10 aI0 aa(lp64 -I3 -aI10 +I9 +aI0 aI0 aa(lp65 -I3 -aI10 +I9 +aI1 aI0 aa(lp66 I3 diff --git a/levels/level1e.dat b/levels/level1e.dat index 022af7f..5d253ab 100644 --- a/levels/level1e.dat +++ b/levels/level1e.dat @@ -103,13 +103,13 @@ I3 aI10 aI0 aa(lp30 -I3 -aI10 -aI0 +I6 +aI8 +aI01 aa(lp31 -I3 -aI10 -aI0 +I6 +aI9 +aI01 aa(lp32 I0 aI8 @@ -144,13 +144,13 @@ I3 aI10 aI0 aa(lp41 -I3 -aI10 -aI0 +I7 +aI8 +aI00 aa(lp42 -I3 -aI10 -aI0 +I7 +aI9 +aI00 aa(lp43 I0 aI8 diff --git a/levels/level1ee.dat b/levels/level1ee.dat index f449775..4de70ae 100644 --- a/levels/level1ee.dat +++ b/levels/level1ee.dat @@ -54,13 +54,13 @@ I0 aI0 aI0 aa(lp17 -I2 -aI0 +I6 +aI6 aI01 aa(lp18 -I0 -aI0 -aI0 +I6 +aI7 +aI01 aa(lp19 I0 aI0 @@ -87,7 +87,7 @@ I3 aI5 aI0 aa(lp26 -I0 +I1 aI0 aI0 aa(lp27 @@ -95,12 +95,12 @@ I0 aI0 aI0 aa(lp28 -I0 -aI0 +I7 +aI6 aI0 aa(lp29 -I0 -aI0 +I7 +aI7 aI0 aa(lp30 I0 @@ -145,7 +145,7 @@ aI0 aI0 aa(lp41 I2 -aI0 +aI5 aI01 aa(lp42 I0 @@ -156,8 +156,8 @@ I0 aI0 aI0 aa(lp44 -I2 -aI5 +I0 +aI0 aI00 aa(lp45 I2 @@ -230,7 +230,7 @@ I0 aI0 aI0 aa(lp64 -I0 +I1 aI0 aI0 aa(lp65 @@ -308,13 +308,13 @@ I3 aI4 aI0 aa(lp85 -I0 -aI0 -aI0 +I6 +aI6 +aI01 aa(lp86 -I0 -aI0 -aI0 +I6 +aI7 +aI01 aa(lp87 I0 aI0 @@ -349,13 +349,13 @@ I0 aI0 aI0 aa(lp96 -I0 -aI0 +I7 +aI6 aI0 aa(lp97 -I2 -aI0 -aI01 +I7 +aI7 +aI00 aa(lp98 I0 aI0 @@ -378,7 +378,7 @@ I0 aI0 aI0 aa(lp104 -I0 +I1 aI0 aI0 aa(lp105 diff --git a/levels/level1n.dat b/levels/level1n.dat index 8bc5e25..063e2ff 100644 --- a/levels/level1n.dat +++ b/levels/level1n.dat @@ -29,8 +29,8 @@ I2 aI4 aI0 aa(lp10 -I0 -aI0 +I3 +aI4 aI0 aa(lp11 I2 @@ -83,13 +83,13 @@ aI10 aI01 aaa(lp24 (lp25 -I0 -aI0 -aI0 +I6 +aI6 +aI01 aa(lp26 -I0 -aI0 -aI0 +I6 +aI7 +aI01 aa(lp27 I3 aI4 @@ -99,13 +99,13 @@ I0 aI0 aI0 aa(lp29 -I2 -aI0 -aI01 -aa(lp30 I0 aI0 -aI0 +aI00 +aa(lp30 +I2 +aI5 +aI01 aa(lp31 I0 aI0 @@ -124,13 +124,13 @@ aI0 aI0 aaa(lp35 (lp36 -I0 -aI0 +I7 +aI6 aI0 aa(lp37 -I2 -aI0 -aI01 +I7 +aI7 +aI00 aa(lp38 I0 aI0 @@ -148,17 +148,17 @@ I0 aI0 aI0 aa(lp42 -I2 +I0 aI0 -aI01 +aI00 aa(lp43 I0 aI0 aI0 aa(lp44 -I2 +I0 aI0 -aI01 +aI00 aa(lp45 I0 aI0 @@ -292,9 +292,9 @@ I0 aI0 aI0 aa(lp81 -I2 +I0 aI0 -aI01 +aI00 aa(lp82 I0 aI0 @@ -316,9 +316,9 @@ I0 aI0 aI0 aa(lp87 -I2 +I0 aI0 -aI01 +aI00 aa(lp88 I0 aI0 @@ -333,17 +333,17 @@ I0 aI0 aI0 aa(lp92 -I0 -aI0 -aI0 +I2 +aI5 +aI01 aa(lp93 I0 aI0 aI0 aa(lp94 -I2 +I0 aI0 -aI01 +aI00 aa(lp95 I0 aI0 @@ -361,13 +361,13 @@ I0 aI0 aI0 aa(lp99 -I0 -aI0 -aI0 -aa(lp100 I2 aI0 aI01 +aa(lp100 +I0 +aI0 +aI00 aaa(lp101 (lp102 I0 diff --git a/levels/level1w.dat b/levels/level1w.dat index 38187ec..883e4cc 100644 --- a/levels/level1w.dat +++ b/levels/level1w.dat @@ -18,7 +18,7 @@ aI1 aI0 aa(lp7 I1 -aI2 +aI3 aI0 aa(lp8 I1 @@ -26,7 +26,7 @@ aI3 aI0 aa(lp9 I1 -aI3 +aI2 aI0 aa(lp10 I1 @@ -54,25 +54,25 @@ I5 aI7 aI0 aa(lp17 -I1 +I2 aI1 aI0 aa(lp18 -I1 -aI3 +I2 +aI2 aI0 aa(lp19 -I1 +I2 aI3 aI0 aa(lp20 -I1 +I2 aI3 aI0 aa(lp21 -I1 +I2 aI4 -aI0 +aI00 aa(lp22 I2 aI10 @@ -84,7 +84,7 @@ aI0 aaa(lp24 (lp25 I2 -aI0 +aI5 aI01 aa(lp26 I5 @@ -95,25 +95,25 @@ I5 aI7 aI0 aa(lp28 -I1 -aI1 +I0 aI0 -aa(lp29 -I1 -aI3 aI0 +aa(lp29 +I6 +aI6 +aI01 aa(lp30 -I1 -aI3 -aI0 +I6 +aI7 +aI01 aa(lp31 I1 -aI2 aI0 -aa(lp32 -I1 -aI4 aI0 +aa(lp32 +I2 +aI5 +aI01 aa(lp33 I2 aI10 @@ -136,25 +136,25 @@ I5 aI7 aI0 aa(lp39 -I2 -aI1 +I0 +aI0 aI0 aa(lp40 -I2 -aI2 +I7 +aI6 aI0 aa(lp41 -I2 -aI3 +I7 +aI7 aI0 aa(lp42 -I2 -aI2 +I0 +aI0 aI0 aa(lp43 -I2 -aI4 +I1 aI0 +aI00 aa(lp44 I2 aI10 @@ -166,7 +166,7 @@ aI01 aaa(lp46 (lp47 I2 -aI0 +aI5 aI01 aa(lp48 I4 @@ -276,7 +276,7 @@ aI0 aI0 aa(lp76 I2 -aI0 +aI5 aI01 aa(lp77 I2 @@ -289,7 +289,7 @@ aI01 aaa(lp79 (lp80 I2 -aI0 +aI5 aI01 aa(lp81 I5 @@ -308,13 +308,13 @@ I0 aI0 aI0 aa(lp85 -I2 -aI0 +I6 +aI6 aI01 aa(lp86 -I0 -aI0 -aI0 +I6 +aI7 +aI01 aa(lp87 I0 aI0 @@ -330,7 +330,7 @@ aI0 aaa(lp90 (lp91 I2 -aI0 +aI5 aI01 aa(lp92 I5 @@ -349,17 +349,17 @@ I3 aI4 aI0 aa(lp96 -I0 -aI0 +I7 +aI6 aI0 aa(lp97 -I0 -aI0 +I7 +aI7 aI0 aa(lp98 -I2 +I0 aI0 -aI01 +aI00 aa(lp99 I2 aI10 @@ -386,9 +386,9 @@ I0 aI0 aI0 aa(lp106 -I2 +I0 aI0 -aI01 +aI00 aa(lp107 I0 aI0 @@ -398,9 +398,9 @@ I0 aI0 aI0 aa(lp109 -I0 -aI0 -aI0 +I2 +aI5 +aI01 aa(lp110 I2 aI10 diff --git a/maingame.py b/maingame.py index 4529e9a..afeeb7c 100644 --- a/maingame.py +++ b/maingame.py @@ -119,7 +119,8 @@ class MainGame: [ os.path.join ("dialogues", "bulisa1.dlg"), os.path.join ("dialogues", "bulisa2.dlg"), os.path.join ("dialogues", "bulisa3.dlg"), - os.path.join ("dialogues", "bulisa4.dlg") ] ) + os.path.join ("dialogues", "bulisa4.dlg"), + os.path.join ("dialogues", "bulisa5.dlg") ] ) chest1.objects = [ gold50, gold25, key2, gold10 ] @@ -309,45 +310,48 @@ class MainGame: # set initial response ID to none resp_id = None # not yet started mission drawing water from well and not refused it - if (gamestate.mission_bulisa_water_from_well is False - and gamestate.mission_bulisa_water_from_well_refused is False): + if (gamestate.flag["mission_bulisa_water_from_well"] is False + and gamestate.flag["mission_bulisa_water_from_well_refused"] is False): # set the current dialogue npc.currentdialog = 0 # get the response ID resp_id = utility.dialogue_play (self.screen, self.img_dialogue, npc, self.butaba.portrait, 0, 90) - if (gamestate.mission_bulisa_water_from_well_refused is True and - gamestate.mission_bulisa_water_from_well is False): + if (gamestate.flag["mission_bulisa_water_from_well_refused"] is True and + gamestate.flag["mission_bulisa_water_from_well"] is False): # set the current dialog npc.currentdialog = 2 resp_id = utility.dialogue_play (self.screen, self.img_dialogue, npc, self.butaba.portrait, 0, 90) # mission accepted but not completed - check if completed and set value # accordingly - elif (gamestate.mission_bulisa_water_from_well is True - and gamestate.mission_bulisa_water_from_well_complete is False): + elif (gamestate.flag["mission_bulisa_water_from_well"] is True + and gamestate.flag["mission_bulisa_water_from_well_complete"] is False): for invobj in self.butaba.objects: if isinstance (invobj, gameobjects.Bucket) is True: if invobj.liquid == "water": - gamestate.mission_bulisa_water_from_well_complete = True + gamestate.flag["mission_bulisa_water_from_well_complete"] = True self.butaba.objects.remove (invobj) key1 = gameobjects.Key (5, 3, "a chest key", self.img_key2, constants.KEY_CHEST1) self.butaba.objects.append (key1) break # water mission is not completed yet - if gamestate.mission_bulisa_water_from_well_complete is False: + if gamestate.flag["mission_bulisa_water_from_well_complete"] is False: npc.currentdialog = 1 else: npc.currentdialog = 3 - # get the response ID resp_id = utility.dialogue_play (self.screen, self.img_dialogue, npc, self.butaba.portrait, 0, 90) + # water from well mission is completed + elif (gamestate.flag["mission_bulisa_water_from_well_complete"]) is True: + npc.currentdialog = 4 + resp_id = utility.dialogue_play (self.screen, self.img_dialogue, npc, self.butaba.portrait, 0, 90) # if response ID is 12, then drawing water from well mission is refused if resp_id == "12" or resp_id == "18": - gamestate.mission_bulisa_water_from_well_refused = True + gamestate.flag["mission_bulisa_water_from_well_refused"] = True # if response ID is 13: that is accepted the drawing water from well mission begins if resp_id == "13" or resp_id == "17": - gamestate.mission_bulisa_water_from_well = True + gamestate.flag["mission_bulisa_water_from_well"] = True # if response ID is none elif resp_id is None: self.status_message = "You cannot initiate a conversation with %s" % npc.charname diff --git a/objects/chest.png b/objects/chest.png index 3c80d0c..6b7608b 100644 Binary files a/objects/chest.png and b/objects/chest.png differ diff --git a/objects/red-potion.png b/objects/red-potion.png index 0d58259..3816a5c 100644 Binary files a/objects/red-potion.png and b/objects/red-potion.png differ