diff --git a/ATL/Lugwey/items.atl b/ATL/Lugwey/items.atl index 865261c..3ef93b9 100644 --- a/ATL/Lugwey/items.atl +++ b/ATL/Lugwey/items.atl @@ -17,28 +17,18 @@ define-item "Dagger" description "A long, sharp knife, useful for self defence." - weapon + weapon-damage 3 cost 20 -define-weapon "Dagger" - description "A long, sharp knife, useful for self defence." - type "Knife" - damage 3 - define-item "Signet ring" description "A heavy gold ring, bearing the seal of the Monastery of Lugwey." cost 100 define-item "Whip" description "A horse-whip." - weapon + weapon-damage 1 cost 10 -define-weapon "Whip" - description "A plain old leather horse-whip." - type "Whip" - damage 1 - define-item "Saddle" description "If you want to ride a horse, a saddle certainly helps." cost 20 @@ -103,10 +93,9 @@ item "Foxhide" armour-class 0 -define-weapon "Teeth" +define-item "Teeth" description "A carnivore's teeth can do quite a bit of damage!" - type "body" - damage 2 + weapon-damage 2 define-item "Foxhide" description "The hide of a red fox - looks good on your wall!" diff --git a/ATL/Lugwey/items.atl b/ATL/Lugwey/items.atl index 865261c..3ef93b9 100644 --- a/ATL/Lugwey/items.atl +++ b/ATL/Lugwey/items.atl @@ -17,28 +17,18 @@ define-item "Dagger" description "A long, sharp knife, useful for self defence." - weapon + weapon-damage 3 cost 20 -define-weapon "Dagger" - description "A long, sharp knife, useful for self defence." - type "Knife" - damage 3 - define-item "Signet ring" description "A heavy gold ring, bearing the seal of the Monastery of Lugwey." cost 100 define-item "Whip" description "A horse-whip." - weapon + weapon-damage 1 cost 10 -define-weapon "Whip" - description "A plain old leather horse-whip." - type "Whip" - damage 1 - define-item "Saddle" description "If you want to ride a horse, a saddle certainly helps." cost 20 @@ -103,10 +93,9 @@ item "Foxhide" armour-class 0 -define-weapon "Teeth" +define-item "Teeth" description "A carnivore's teeth can do quite a bit of damage!" - type "body" - damage 2 + weapon-damage 2 define-item "Foxhide" description "The hide of a red fox - looks good on your wall!" diff --git a/ATL/Lugwey/lugwey.atl b/ATL/Lugwey/lugwey.atl index a1a09fb..4a7c635 100644 --- a/ATL/Lugwey/lugwey.atl +++ b/ATL/Lugwey/lugwey.atl @@ -7,8 +7,6 @@ ; @author Daniel Vedder ; @date 09/07/2015 -name-world "Lugwey" - load-file "places.atl" load-file "items.atl" load-file "npcs.atl" diff --git a/ATL/Lugwey/items.atl b/ATL/Lugwey/items.atl index 865261c..3ef93b9 100644 --- a/ATL/Lugwey/items.atl +++ b/ATL/Lugwey/items.atl @@ -17,28 +17,18 @@ define-item "Dagger" description "A long, sharp knife, useful for self defence." - weapon + weapon-damage 3 cost 20 -define-weapon "Dagger" - description "A long, sharp knife, useful for self defence." - type "Knife" - damage 3 - define-item "Signet ring" description "A heavy gold ring, bearing the seal of the Monastery of Lugwey." cost 100 define-item "Whip" description "A horse-whip." - weapon + weapon-damage 1 cost 10 -define-weapon "Whip" - description "A plain old leather horse-whip." - type "Whip" - damage 1 - define-item "Saddle" description "If you want to ride a horse, a saddle certainly helps." cost 20 @@ -103,10 +93,9 @@ item "Foxhide" armour-class 0 -define-weapon "Teeth" +define-item "Teeth" description "A carnivore's teeth can do quite a bit of damage!" - type "body" - damage 2 + weapon-damage 2 define-item "Foxhide" description "The hide of a red fox - looks good on your wall!" diff --git a/ATL/Lugwey/lugwey.atl b/ATL/Lugwey/lugwey.atl index a1a09fb..4a7c635 100644 --- a/ATL/Lugwey/lugwey.atl +++ b/ATL/Lugwey/lugwey.atl @@ -7,8 +7,6 @@ ; @author Daniel Vedder ; @date 09/07/2015 -name-world "Lugwey" - load-file "places.atl" load-file "items.atl" load-file "npcs.atl" diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl index 0a7aed0..eaa654e 100644 --- a/ATL/Pooh/pooh.atl +++ b/ATL/Pooh/pooh.atl @@ -19,11 +19,3 @@ strength 1 dexterity 4 constitution 4 - -;TODO development - remove before release -define-player "Christopher Robin" - description "Christopher Robin is my game dev character." - place "Owl's Porch" - item "Key" - item "Map" - item "Letter" \ No newline at end of file diff --git a/ATL/Lugwey/items.atl b/ATL/Lugwey/items.atl index 865261c..3ef93b9 100644 --- a/ATL/Lugwey/items.atl +++ b/ATL/Lugwey/items.atl @@ -17,28 +17,18 @@ define-item "Dagger" description "A long, sharp knife, useful for self defence." - weapon + weapon-damage 3 cost 20 -define-weapon "Dagger" - description "A long, sharp knife, useful for self defence." - type "Knife" - damage 3 - define-item "Signet ring" description "A heavy gold ring, bearing the seal of the Monastery of Lugwey." cost 100 define-item "Whip" description "A horse-whip." - weapon + weapon-damage 1 cost 10 -define-weapon "Whip" - description "A plain old leather horse-whip." - type "Whip" - damage 1 - define-item "Saddle" description "If you want to ride a horse, a saddle certainly helps." cost 20 @@ -103,10 +93,9 @@ item "Foxhide" armour-class 0 -define-weapon "Teeth" +define-item "Teeth" description "A carnivore's teeth can do quite a bit of damage!" - type "body" - damage 2 + weapon-damage 2 define-item "Foxhide" description "The hide of a red fox - looks good on your wall!" diff --git a/ATL/Lugwey/lugwey.atl b/ATL/Lugwey/lugwey.atl index a1a09fb..4a7c635 100644 --- a/ATL/Lugwey/lugwey.atl +++ b/ATL/Lugwey/lugwey.atl @@ -7,8 +7,6 @@ ; @author Daniel Vedder ; @date 09/07/2015 -name-world "Lugwey" - load-file "places.atl" load-file "items.atl" load-file "npcs.atl" diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl index 0a7aed0..eaa654e 100644 --- a/ATL/Pooh/pooh.atl +++ b/ATL/Pooh/pooh.atl @@ -19,11 +19,3 @@ strength 1 dexterity 4 constitution 4 - -;TODO development - remove before release -define-player "Christopher Robin" - description "Christopher Robin is my game dev character." - place "Owl's Porch" - item "Key" - item "Map" - item "Letter" \ No newline at end of file diff --git a/doc/TODO b/doc/TODO index b1ee5f1..6fa8785 100644 --- a/doc/TODO +++ b/doc/TODO @@ -6,4 +6,3 @@ ATL * remove Christopher Robin character -* fix Deep Forest bug diff --git a/ATL/Lugwey/items.atl b/ATL/Lugwey/items.atl index 865261c..3ef93b9 100644 --- a/ATL/Lugwey/items.atl +++ b/ATL/Lugwey/items.atl @@ -17,28 +17,18 @@ define-item "Dagger" description "A long, sharp knife, useful for self defence." - weapon + weapon-damage 3 cost 20 -define-weapon "Dagger" - description "A long, sharp knife, useful for self defence." - type "Knife" - damage 3 - define-item "Signet ring" description "A heavy gold ring, bearing the seal of the Monastery of Lugwey." cost 100 define-item "Whip" description "A horse-whip." - weapon + weapon-damage 1 cost 10 -define-weapon "Whip" - description "A plain old leather horse-whip." - type "Whip" - damage 1 - define-item "Saddle" description "If you want to ride a horse, a saddle certainly helps." cost 20 @@ -103,10 +93,9 @@ item "Foxhide" armour-class 0 -define-weapon "Teeth" +define-item "Teeth" description "A carnivore's teeth can do quite a bit of damage!" - type "body" - damage 2 + weapon-damage 2 define-item "Foxhide" description "The hide of a red fox - looks good on your wall!" diff --git a/ATL/Lugwey/lugwey.atl b/ATL/Lugwey/lugwey.atl index a1a09fb..4a7c635 100644 --- a/ATL/Lugwey/lugwey.atl +++ b/ATL/Lugwey/lugwey.atl @@ -7,8 +7,6 @@ ; @author Daniel Vedder ; @date 09/07/2015 -name-world "Lugwey" - load-file "places.atl" load-file "items.atl" load-file "npcs.atl" diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl index 0a7aed0..eaa654e 100644 --- a/ATL/Pooh/pooh.atl +++ b/ATL/Pooh/pooh.atl @@ -19,11 +19,3 @@ strength 1 dexterity 4 constitution 4 - -;TODO development - remove before release -define-player "Christopher Robin" - description "Christopher Robin is my game dev character." - place "Owl's Porch" - item "Key" - item "Map" - item "Letter" \ No newline at end of file diff --git a/doc/TODO b/doc/TODO index b1ee5f1..6fa8785 100644 --- a/doc/TODO +++ b/doc/TODO @@ -6,4 +6,3 @@ ATL * remove Christopher Robin character -* fix Deep Forest bug diff --git a/doc/bugreport.txt b/doc/bugreport.txt index a531c92..d1b583f 100644 --- a/doc/bugreport.txt +++ b/doc/bugreport.txt @@ -31,7 +31,9 @@ * Gerade stürzt das Spiel bei jedem Versuch, von den Central Woods woanders hin zu kommen, ab. Schade. -> Reproducible on server, but not on laptop?! + -> FIXED * Cool, was für schöne Details du eingebaut hast! + -> Won't fix ;-) :D Liebe Grüße, Chris @@ -42,3 +44,4 @@ ' is not a number' (on server) -> Could not reproduce -> but see above! (Heisenbug?) +-> FIXED (bug when incrementing character level) diff --git a/ATL/Lugwey/items.atl b/ATL/Lugwey/items.atl index 865261c..3ef93b9 100644 --- a/ATL/Lugwey/items.atl +++ b/ATL/Lugwey/items.atl @@ -17,28 +17,18 @@ define-item "Dagger" description "A long, sharp knife, useful for self defence." - weapon + weapon-damage 3 cost 20 -define-weapon "Dagger" - description "A long, sharp knife, useful for self defence." - type "Knife" - damage 3 - define-item "Signet ring" description "A heavy gold ring, bearing the seal of the Monastery of Lugwey." cost 100 define-item "Whip" description "A horse-whip." - weapon + weapon-damage 1 cost 10 -define-weapon "Whip" - description "A plain old leather horse-whip." - type "Whip" - damage 1 - define-item "Saddle" description "If you want to ride a horse, a saddle certainly helps." cost 20 @@ -103,10 +93,9 @@ item "Foxhide" armour-class 0 -define-weapon "Teeth" +define-item "Teeth" description "A carnivore's teeth can do quite a bit of damage!" - type "body" - damage 2 + weapon-damage 2 define-item "Foxhide" description "The hide of a red fox - looks good on your wall!" diff --git a/ATL/Lugwey/lugwey.atl b/ATL/Lugwey/lugwey.atl index a1a09fb..4a7c635 100644 --- a/ATL/Lugwey/lugwey.atl +++ b/ATL/Lugwey/lugwey.atl @@ -7,8 +7,6 @@ ; @author Daniel Vedder ; @date 09/07/2015 -name-world "Lugwey" - load-file "places.atl" load-file "items.atl" load-file "npcs.atl" diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl index 0a7aed0..eaa654e 100644 --- a/ATL/Pooh/pooh.atl +++ b/ATL/Pooh/pooh.atl @@ -19,11 +19,3 @@ strength 1 dexterity 4 constitution 4 - -;TODO development - remove before release -define-player "Christopher Robin" - description "Christopher Robin is my game dev character." - place "Owl's Porch" - item "Key" - item "Map" - item "Letter" \ No newline at end of file diff --git a/doc/TODO b/doc/TODO index b1ee5f1..6fa8785 100644 --- a/doc/TODO +++ b/doc/TODO @@ -6,4 +6,3 @@ ATL * remove Christopher Robin character -* fix Deep Forest bug diff --git a/doc/bugreport.txt b/doc/bugreport.txt index a531c92..d1b583f 100644 --- a/doc/bugreport.txt +++ b/doc/bugreport.txt @@ -31,7 +31,9 @@ * Gerade stürzt das Spiel bei jedem Versuch, von den Central Woods woanders hin zu kommen, ab. Schade. -> Reproducible on server, but not on laptop?! + -> FIXED * Cool, was für schöne Details du eingebaut hast! + -> Won't fix ;-) :D Liebe Grüße, Chris @@ -42,3 +44,4 @@ ' is not a number' (on server) -> Could not reproduce -> but see above! (Heisenbug?) +-> FIXED (bug when incrementing character level) diff --git a/lisp/player.lisp b/lisp/player.lisp index ff12d22..59796d1 100644 --- a/lisp/player.lisp +++ b/lisp/player.lisp @@ -74,7 +74,7 @@ "The player gains experience points" (incf (player-experience player) amount) (when (zerop (rem (player-experience player) *level-experience*)) - (incf (player-level player) player))) + (incf (player-level player)))) (defun add-player-money (player amount) "Increase the player's money by amount"