Skip to content

Commit

Permalink
Minor adjustment to fountain / chest dungeon display.
Browse files Browse the repository at this point in the history
  • Loading branch information
Feneric committed Oct 2, 2018
1 parent f87e892 commit 940900c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion minima.p8
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ end

-- basetypes are the objects we mean to use to make objects.
-- they inherit (often indirectly) from our root object.
basetypes=json_parse('[{"dex":8,"ar":1,"t":[1,2,3,4,5,6,7,8,17,18,22,25,26,27,30,31,33,35],"hos":1,"exp":2,"gp":10,"dmg":13,"mva":1,"ch":1,"hp":10},{"mxy":64,"mxm":0,"fri":1,"mn":0,"newm":0,"mny":0,"mnx":80,"mxx":128},{"dg":1,"ss":17,"mn":0,"c":{},"mny":1,"fri":false,"sf":1,"sz":1,"sy":1,"sx":1,"mxx":9,"mxm":27,"newm":25,"mnx":1,"mxy":9},{"n":"ankh","i":38,"d":["yes, ankhs can talk.","shrines make good landmarks."],"ia":38},{"i":70,"p":1,"fm":1,"n":"ship","f":2,"ia":70},{"i":92,"p":1,"n":"chest","szm":12,"ia":92},{"fi":1,"i":39,"p":1,"n":"fountain","iseq":12,"szm":15},{"i":27,"p":1,"n":"ladder up","szm":20,"ia":27,"shm":12},{"i":26,"p":1,"n":"ladder down","szm":20,"ia":26,"shm":-3},{"hos":false,"i":80,"ar":0,"exp":1,"gp":5},{"n":"orc","ch":8,"d":["urg!","grar!"]},{"dmg":14,"gp":5,"ch":5,"dex":6},{"dex":10,"gp":0,"ch":3,"ar":0},{"cs":[{},[[1,12],[14,2],[15,4]]],"i":82,"ar":3,"dex":9,"n":"fighter","dmg":20,"d":["check out these pecs!","i\'m jacked!"],"hp":12},{"cs":[{},[[15,4]]],"i":90,"mva":0,"ar":12,"n":"guard","dmg":60,"d":["behave yourself.","i protect good citizens."],"hp":85},{"fi":1,"i":75,"n":"merchant","d":["consume!","stuff makes you happy!"],"cs":[{},[[1,4],[4,15],[6,1],[14,13]],[[1,4],[6,5],[14,10]],[[1,4],[4,15],[6,1],[14,3]]]},{"fi":1,"i":81,"n":"lady","d":["pardon me.","well i never."],"cs":[{},[[2,9],[4,15],[13,14]],[[2,10],[4,15],[13,9]],[[2,11],[13,3]]]},{"n":"shepherd","i":76,"d":["i like sheep.","the open air is nice."],"cs":[{},[[6,5],[15,4]],[[6,5]],[[15,4]]]},{"n":"jester","i":78,"d":["ho ho ho!","ha ha ha!"],"dex":12},{"n":"mage","i":84,"ac":[[9,6],[8,13],[10,12]],"d":["a mage is always on time.","brain over brawn."]},{"n":"ranger","cs":[{},[[9,11],[1,3],[15,4]],[[9,11],[1,3]],[[15,4]]],"d":["i travel the land.","my home is the range."],"fi":1},{"hos":1,"gp":15,"n":"villain","exp":5,"d":["stand and deliver!","you shall die!"],"ar":1},{"n":"grocer","mch":"food"},{"n":"armorer","mch":"armor"},{"n":"smith","mch":"weapons"},{"n":"medic","mch":"hospital"},{"n":"guildkeeper","mch":"guild"},{"n":"barkeep","mch":"bar"},{"i":96},{"exp":4,"i":102,"n":"troll","gp":10,"dmg":16,"hp":15},{"exp":3,"i":104,"ns":["hobgoblin","bugbear"],"dmg":14,"gp":8,"hp":15},{"exp":1,"i":114,"ns":["goblin","kobold"],"dmg":10,"gp":5,"hp":8},{"fi":1,"i":118,"dmg":18,"n":"ettin","exp":6,"ch":1,"hp":20},{"n":"skeleton","i":98,"gp":12},{"i":100,"hp":10,"ns":["zombie","wight","ghoul"]},{"fi":1,"i":123,"ns":["phantom","ghost","wraith"],"d":["boooo!","feeear me!"],"exp":7,"t":[1,2,3,4,5,6,7,8,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,33,35],"hp":15},{"cs":[{},[[2,8],[15,4]]],"i":84,"ac":[[9,6],[8,13],[10,12]],"ns":["warlock","necromancer","sorcerer"],"dmg":18,"d":["i hex you!","a curse on you!"],"exp":10},{"cs":[{},[[1,5],[8,2],[4,1],[2,12],[15,4]]],"i":88,"ns":["rogue","bandit","cutpurse"],"th":1,"ch":2,"dex":10},{"cs":[{},[[1,5],[15,4]]],"i":86,"ns":["ninja","assassin"],"gp":10,"d":["you shall die at my hands.","you are no match for me."],"po":1,"exp":8},{"exp":5,"i":106,"n":"giant spider","gp":8,"po":1,"hp":18},{"eat":1,"i":108,"exp":2,"n":"giant rat","dmg":10,"po":1,"hp":5},{"exp":6,"i":112,"ns":["giant snake","serpent"],"ch":1,"t":[4,5,6,7],"po":1,"hp":20},{"exp":10,"i":116,"n":"sea serpent","t":[5,12,13,14,15,25],"hp":45},{"fi":1,"i":125,"ch":1,"n":"megascorpion","exp":5,"po":1,"hp":12},{"cs":[{},[[3,9],[11,10]],[[3,14],[11,15]]],"i":122,"exp":2,"ns":["slime","jelly","blob"],"gp":5,"eat":1,"t":[17,22,23],"fi":1},{"exp":8,"i":94,"ns":["kraken","giant squid"],"ch":2,"t":[12,13,14,15],"hp":50},{"fi":1,"i":120,"n":"wisp","t":[4,5,6],"exp":3},{"cs":[[[6,5],[7,6]]],"i":70,"exp":8,"fm":1,"n":"pirate","f":1,"t":[12,13,14,15],"fi":false},{"cs":[{},[[2,14],[1,4]]],"i":119,"ns":["gazer","beholder"],"exp":4,"t":[17,22],"fi":1},{"fi":1,"i":121,"ns":["dragon","drake","wyvern"],"ar":7,"ac":[[9,6],[8,13],[10,12]],"dmg":28,"exp":17,"gp":20,"hp":50},{"exp":15,"i":110,"ns":["daemon","devil"],"ar":3,"t":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,22,25,26,27,30,31,33,35],"ac":[[9,10],[8,9],[10,7]],"dmg":23,"gp":25,"ch":0.25,"hp":50},{"exp":4,"i":92,"ch":0,"th":1,"n":"mimic","gp":12,"t":[17,22],"mva":0},{"fi":1,"i":124,"ar":5,"t":[17,22],"mva":0,"exp":5,"n":"reaper","gp":8,"ch":0,"hp":30}]')
basetypes=json_parse('[{"t":[1,2,3,4,5,6,7,8,17,18,22,25,26,27,30,31,33,35],"gp":10,"hp":10,"ch":1,"mva":1,"hos":1,"ar":1,"exp":2,"dex":8,"dmg":13},{"mxx":128,"mn":0,"fri":1,"mxy":64,"mnx":80,"mxm":0,"newm":0,"mny":0},{"sz":1,"sy":1,"sx":1,"mnx":1,"sf":1,"dg":1,"c":{},"mxm":27,"mn":0,"ss":17,"mxy":9,"fri":false,"newm":25,"mxx":9,"mny":1},{"i":38,"ia":38,"n":"ankh","d":["yes, ankhs can talk.","shrines make good landmarks."]},{"ia":70,"p":1,"i":70,"f":2,"n":"ship","fm":1},{"ia":92,"shm":-2,"i":92,"szm":11,"n":"chest","p":1},{"iseq":12,"n":"fountain","fi":1,"i":39,"szm":14,"shm":-2,"p":1},{"ia":27,"shm":12,"i":27,"szm":20,"n":"ladder up","p":1},{"ia":26,"shm":-3,"i":26,"szm":20,"n":"ladder down","p":1},{"hos":false,"i":80,"exp":1,"gp":5,"ar":0},{"n":"orc","ch":8,"d":["urg!","grar!"]},{"dmg":14,"gp":5,"ch":5,"dex":6},{"dex":10,"gp":0,"ch":3,"ar":0},{"dex":9,"n":"fighter","cs":[{},[[1,12],[14,2],[15,4]]],"d":["check out these pecs!","i\'m jacked!"],"i":82,"hp":12,"dmg":20,"ar":3},{"ar":12,"n":"guard","cs":[{},[[15,4]]],"d":["behave yourself.","i protect good citizens."],"i":90,"hp":85,"dmg":60,"mva":0},{"n":"merchant","fi":1,"d":["consume!","stuff makes you happy!"],"i":75,"cs":[{},[[1,4],[4,15],[6,1],[14,13]],[[1,4],[6,5],[14,10]],[[1,4],[4,15],[6,1],[14,3]]]},{"n":"lady","fi":1,"d":["pardon me.","well i never."],"i":81,"cs":[{},[[2,9],[4,15],[13,14]],[[2,10],[4,15],[13,9]],[[2,11],[13,3]]]},{"i":76,"n":"shepherd","cs":[{},[[6,5],[15,4]],[[6,5]],[[15,4]]],"d":["i like sheep.","the open air is nice."]},{"i":78,"n":"jester","dex":12,"d":["ho ho ho!","ha ha ha!"]},{"i":84,"n":"mage","ac":[[9,6],[8,13],[10,12]],"d":["a mage is always on time.","brain over brawn."]},{"cs":[{},[[9,11],[1,3],[15,4]],[[9,11],[1,3]],[[15,4]]],"n":"ranger","fi":1,"d":["i travel the land.","my home is the range."]},{"hos":1,"n":"villain","d":["stand and deliver!","you shall die!"],"ar":1,"exp":5,"gp":15},{"mch":"food","n":"grocer"},{"mch":"armor","n":"armorer"},{"mch":"weapons","n":"smith"},{"mch":"hospital","n":"medic"},{"mch":"guild","n":"guildkeeper"},{"mch":"bar","n":"barkeep"},{"i":96},{"n":"troll","exp":4,"i":102,"hp":15,"gp":10,"dmg":16},{"exp":3,"gp":8,"i":104,"hp":15,"dmg":14,"ns":["hobgoblin","bugbear"]},{"exp":1,"gp":5,"i":114,"hp":8,"dmg":10,"ns":["goblin","kobold"]},{"n":"ettin","fi":1,"exp":6,"i":118,"hp":20,"ch":1,"dmg":18},{"i":98,"n":"skeleton","gp":12},{"i":100,"hp":10,"ns":["zombie","wight","ghoul"]},{"d":["boooo!","feeear me!"],"fi":1,"t":[1,2,3,4,5,6,7,8,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,33,35],"i":123,"hp":15,"exp":7,"ns":["phantom","ghost","wraith"]},{"exp":10,"cs":[{},[[2,8],[15,4]]],"d":["i hex you!","a curse on you!"],"i":84,"dmg":18,"ac":[[9,6],[8,13],[10,12]],"ns":["warlock","necromancer","sorcerer"]},{"cs":[{},[[1,5],[8,2],[4,1],[2,12],[15,4]]],"dex":10,"i":88,"th":1,"ch":2,"ns":["rogue","bandit","cutpurse"]},{"exp":8,"cs":[{},[[1,5],[15,4]]],"d":["you shall die at my hands.","you are no match for me."],"i":86,"gp":10,"po":1,"ns":["ninja","assassin"]},{"n":"giant spider","exp":5,"i":106,"hp":18,"gp":8,"po":1},{"n":"giant rat","exp":2,"eat":1,"i":108,"hp":5,"po":1,"dmg":10},{"po":1,"exp":6,"t":[4,5,6,7],"i":112,"hp":20,"ch":1,"ns":["giant snake","serpent"]},{"n":"sea serpent","t":[5,12,13,14,15,25],"i":116,"hp":45,"exp":10},{"n":"megascorpion","fi":1,"exp":5,"i":125,"hp":12,"ch":1,"po":1},{"exp":2,"eat":1,"cs":[{},[[3,9],[11,10]],[[3,14],[11,15]]],"t":[17,22,23],"i":122,"gp":5,"fi":1,"ns":["slime","jelly","blob"]},{"exp":8,"t":[12,13,14,15],"i":94,"hp":50,"ch":2,"ns":["kraken","giant squid"]},{"n":"wisp","fi":1,"t":[4,5,6],"i":120,"exp":3},{"exp":8,"n":"pirate","cs":[[[6,5],[7,6]]],"t":[12,13,14,15],"i":70,"f":1,"fi":false,"fm":1},{"cs":[{},[[2,14],[1,4]]],"t":[17,22],"i":119,"exp":4,"fi":1,"ns":["gazer","beholder"]},{"fi":1,"ac":[[9,6],[8,13],[10,12]],"hp":50,"ns":["dragon","drake","wyvern"],"exp":17,"i":121,"gp":20,"dmg":28,"ar":7},{"t":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,22,25,26,27,30,31,33,35],"ac":[[9,10],[8,9],[10,7]],"hp":50,"ch":0.25,"ns":["daemon","devil"],"exp":15,"i":110,"gp":25,"dmg":23,"ar":3},{"th":1,"n":"mimic","exp":4,"t":[17,22],"i":92,"gp":12,"ch":0,"mva":0},{"fi":1,"t":[17,22],"gp":8,"hp":30,"ch":0,"mva":0,"n":"reaper","i":124,"exp":5,"ar":5}]')
-- give our base objects ns for convenience & efficiency.
shiptype=basetypes[5]

Expand Down
Binary file modified minima.p8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions tojson.lua
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,16 @@ basetypes={
i=92,
ia=92,
n="chest",
szm=12,
shm=-2,
szm=11,
p=1
},{
i=39,
fi=1,
iseq=12,
n="fountain",
szm=15,
shm=-2,
szm=14,
p=1
},{
i=27,
Expand Down

0 comments on commit 940900c

Please sign in to comment.