diff --git a/dev/Catalogue/c2tods_refresh.catalogue b/dev/Catalogue/c2tods_refresh.catalogue index b8c86f5..d5ff2fa 100644 --- a/dev/Catalogue/c2tods_refresh.catalogue +++ b/dev/Catalogue/c2tods_refresh.catalogue @@ -228,7 +228,7 @@ TAG "Agent Help 2 4 50202" TAG "Agent Help 2 4 50204" "C2DS Gelsemium Plant" -"Gelsemium Plant " +"A strange mushroom type plant that grows in very few places – the fruit is a valued medicine and will not survive off the plant for very long if the conditions are not right." TAG "Agent Help 2 4 50217" "C2DS Aubergine Plant" @@ -248,11 +248,11 @@ TAG "Agent Help 2 5 50203" TAG "Agent Help 2 5 50206" "C2DS Spinnomosa" -"Spinnomosa " +"Likes warm, desert conditions, grows all year round (except winter) in the mornings, produces flowers at night." TAG "Agent Help 2 5 50207" "C2DS Spikeocausius" -"Spikeocausius " +"Likes warm, desert conditions, produces flowers in springtime nights." TAG "Agent Help 2 6 50200" "C2DS World Tree Leaf" @@ -312,11 +312,11 @@ TAG "Agent Help 2 7 50203" TAG "Agent Help 2 7 50204" "C2DS Pear Flower" -"Pear Flower " +"Likes temperate/sub tropical conditions, opens sepals during the day to reveal a juicy fruit. Seeds can lay dormant during winter." TAG "Agent Help 2 7 50205" "C2DS Triffid Flower" -"Triffid Flower " +"This plant reproduces by sexual reproduction, and produces several seed that sits inside a protective bubble. It is a hardy species that can survive in a wide range of climates. The fruit is good source of nutrition." TAG "Agent Help 2 7 50209" "C2DS Foxfire Flower" @@ -440,11 +440,11 @@ TAG "Agent Help 2 10 50218" TAG "Agent Help 2 11 50200" "C2DS Carrot" -"Carrot " +"A staple diet food for Norns and many other creatures in Albia." TAG "Agent Help 2 11 50201" "C2DS Potato" -"Potato " +"Another root food source for Norns, high in starch." TAG "Agent Help 2 11 50202" "C2DS Cheese" @@ -504,19 +504,19 @@ TAG "Agent Help 2 13 50210" TAG "Agent Help 2 14 50200" "C2DS Bee" -"Bee " +"They will fly to flowers and bring pollen and nectar back to the hive. Bees are relatively harmless unless disturbed, in which case, run!" TAG "Agent Help 2 14 50201" "C2DS Queen Bee" -"Queen Bee " +"Queen of an Albian bee swarm. She will form a new nest if she finds a suitable spot." TAG "Agent Help 2 14 50204" "C2DS Queen Ant" -"Queen Ant " +"Queen ants will fly until they find a new locaiton suitable for a nest." TAG "Agent Help 2 14 50205" "C2DS Ant" -"Ant " +"Ants are busy little workers that are known to eat both desiccated root crops and rotten fruit." TAG "Agent Help 2 14 50209" "C2DS Wasp" @@ -524,15 +524,15 @@ TAG "Agent Help 2 14 50209" TAG "Agent Help 2 15 50201" "C2DS Snail" -"Snail " +"Not much is known about the Albian snail, but it appears harmless." TAG "Agent Help 2 15 50202" "C2DS Zander Fish" -"Zander Fish " +"Zander fishes school together later in the year before breeding. They are very tasty to Norns." TAG "Agent Help 2 15 50203" "C2DS Goldfish" -"Goldfish " +"Albian goldfishes have memories of only a few seconds." TAG "Agent Help 2 15 50204" "C2DS Hummingbird" @@ -544,7 +544,7 @@ TAG "Agent Help 2 15 50205" TAG "Agent Help 2 15 50208" "C2DS Anemone" -"Anemone " +"Anemones are harmless, but tend to wrap up and hide when touched or interfered with." TAG "Agent Help 2 15 50209" "C2DS Jellyfish Polyp" @@ -556,7 +556,7 @@ TAG "Agent Help 2 15 50212" TAG "Agent Help 2 15 50213" "C2DS Jellyfish" -"Jellyfish " +"The Jellyfish can be highly dangerous if touched. Its lifecycle takes it through many forms!" TAG "Agent Help 2 15 50214" "C2DS Jellyfish Larvae" @@ -588,7 +588,7 @@ TAG "Agent Help 2 16 50201" TAG "Agent Help 2 16 50203" "C2DS Bat" -"Bat " +"Bats only come out at night, and can be dangerous. Eats fruits, which it fetches and takes back to its lair." TAG "Agent Help 2 16 50210" "C2DS Tiger Barb" @@ -596,7 +596,7 @@ TAG "Agent Help 2 16 50210" TAG "Agent Help 2 17 50200" "C2DS Beehive" -"Beehive " +"Home of the Albian Bee. Inside is a queen. When the nest reaches maturity, it may swarm and release a new queen to found a new kingdom." TAG "Agent Help 2 17 50202" "C2DS Puffball Nest " diff --git a/dev/Images/moe_C2toDS_VolcDoubleFalls.c16 b/dev/Images/moe_C2toDS_VolcDoubleFalls.c16 new file mode 100644 index 0000000..160983d Binary files /dev/null and b/dev/Images/moe_C2toDS_VolcDoubleFalls.c16 differ diff --git a/dev/Images/moe_C2toDS_sock.c16 b/dev/Images/moe_C2toDS_sock.c16 new file mode 100644 index 0000000..e63f871 Binary files /dev/null and b/dev/Images/moe_C2toDS_sock.c16 differ diff --git a/dev/Images/moe_C2toDS_volcFloodOverlay.c16 b/dev/Images/moe_C2toDS_volcFloodOverlay.c16 new file mode 100644 index 0000000..eb0a7bc Binary files /dev/null and b/dev/Images/moe_C2toDS_volcFloodOverlay.c16 differ diff --git a/dev/Scripts/1.0_Ambient_Sounds.cos b/dev/Scripts/1.0_Ambient_Sounds.cos index a3c6a36..03634b8 100644 --- a/dev/Scripts/1.0_Ambient_Sounds.cos +++ b/dev/Scripts/1.0_Ambient_Sounds.cos @@ -582,29 +582,29 @@ setv name "whatamI?" 8 scrp 1 12 50200 9 doif name "whatamI?" eq 1 - doif game "VolcanoFlooded" eq 0 +*doif game "VolcanoFlooded" eq 0 and game "VolcanoGarden" eq 0 - rnge 100 + rnge 100 - sndc "flam" + sndc "flam" *sndc "moev" - tick rand 10 200 + tick rand 10 200 - anim [0 1 2 3 4 5 6 7 8 9] + anim [0 1 2 3 4 5 6 7 8 9] - over + over - pose 10 - else - new: simp 2 19 50212 "moe_C2toDS_bubbles" 11 0 rand 1000 5000 - mvsf 9140 49730 - - targ ownr - tick rand 10 200 - - endi + pose 10 +*else +* new: simp 2 19 50212 "moe_C2toDS_bubbles" 11 0 rand 1000 5000 +* mvsf 9140 49730 +* +* targ ownr + tick rand 10 200 +* +*endi endi *stim shou 10 9 100 0 22 100 0 0 0 0 0 0 @@ -931,7 +931,8 @@ scrp 1 12 50200 9 *Left Lava - doif name "whatamI?" eq 8 and game "VolcanoFlooded" eq 0 + doif name "whatamI?" eq 8 +*and game "VolcanoFlooded" eq 0 and game "VolcanoGarden" eq 0 setv va00 rand 0 4 @@ -977,7 +978,8 @@ scrp 1 12 50200 9 *Right Lava - doif name "whatamI?" eq 9 and game "VolcanoFlooded" eq 0 + doif name "whatamI?" eq 9 +* and game "VolcanoFlooded" eq 0 and game "VolcanoGarden" eq 0 setv va00 rand 0 4 @@ -1022,18 +1024,18 @@ scrp 1 12 50200 9 endi doif name "whatamI?" eq 11 - doif game "VolcanoFlooded" eq 0 - sndl "m_wn" - elif game "VolcanoFlooded" eq 1 - stpc - endi +*doif game "VolcanoFlooded" eq 0 and game "VolcanoGarden" eq 0 + sndl "m_wn" +*elif game "VolcanoFlooded" eq 1 or game "VolcanoGarden" eq 0 +* stpc +*endi endi doif name "whatamI?" eq 12 - doif game "VolcanoFlooded" eq 0 - sndl "moev" - elif game "VolcanoFlooded" eq 1 - stpc - endi +*doif game "VolcanoFlooded" eq 0 and game "VolcanoGarden" eq 0 + sndl "moev" +*elif game "VolcanoFlooded" eq 1 or game "VolcanoGarden" eq 0 +* stpc +*endi endi endm @@ -1156,8 +1158,3 @@ next scrx 2 19 50213 10 scrx 2 19 50213 9 scrx 2 19 50213 6 - - - - - diff --git a/dev/Scripts/1.0_VolcWaterfallA.cos b/dev/Scripts/1.0_VolcWaterfallA.cos index 3f10aaa..0465eae 100644 --- a/dev/Scripts/1.0_VolcWaterfallA.cos +++ b/dev/Scripts/1.0_VolcWaterfallA.cos @@ -1,13 +1,10 @@ -*3 3 50202 - valve to open water -*2 19 50214 - waterfall -*1 8 50200 - waves (C2DS World Overlays) -*2 19 50215 - bubbles + +*Now modified to be self-contained. new: simp 3 3 50202 "moe_C2toDS_VolcanoWaterfallA" 2 0 10 attr 4 mvto 10146 49061 - scrp 3 3 50202 10 setv name "open" 0 endm @@ -27,12 +24,45 @@ scrp 3 3 50202 1 endi *** +*kill volcano overlays + enum 1 12 50200 + doif targ ne null + doif name "whatamI?" eq 8 or name "whatamI?" eq 9 or name "whatamI?" eq 11 or name "whatamI?" eq 12 or name "whatamI?" eq 1 + kill targ + endi + endi + next + + +*submerged volcano background + new: simp 1 12 50200 "moe_C2toDS_volcFloodOverlay" 1 0 2 + setv name "whatamI?" 15 + mvto 8646 49221 + targ ownr + +*cap overlays + new: simp 1 12 50200 "moe_C2toDS_volcFloodOverlay" 1 1 8000 + setv name "whatamI?" 15 + mvto 9202 49715 + targ ownr + +*hide old caps + enum 1 8 50200 + doif targ ne null + doif name "whatamI?" eq 16 + kill targ + endi + endi + next + + *Create waterfall - new: simp 2 19 50214 "moe_C2toDS_VolcanoWaterfallA" 55 2 11 - mvto 9682 49079 + new: simp 2 19 50214 "moe_C2toDS_VolcDoubleFalls" 40 2 10 + mvto 9544 49055 targ ownr + *Change rooms to salt water setv va00 8780 loop @@ -61,7 +91,6 @@ scrp 3 3 50202 1 anim [0 1 2 3 4 5 6 7 8 255] addv va02 128 untl va00 eq 10 - new: simp 1 8 50200 "moe_C2toDS_Waves" 9 0 7999 attr 0 setv name "whatamI?" 10 @@ -77,7 +106,7 @@ scrp 3 3 50202 1 pose 0 *remove bubbles - enum 2 19 50215 + enum 2 19 24206 kill targ next *remove waterfall @@ -106,6 +135,155 @@ scrp 3 3 50202 1 rtyp grap va00 49835 va20 addv va00 10 untl va00 ge 10275 + +*remove background and set caps back + enum 1 12 50200 + doif name "whatamI?" eq 15 + kill targ + endi + next +* enum 1 8 50200 +* doif targ ne null +* doif name "whatamI?" eq 16 +* show 1 +* endi +* endi +* next + + +*Restore Volcano Overlays +*Left Lava Bubble + new: simp 1 12 50200 "moe_C2toDS_vflm" 11 30 1 + frat 2 + attr 0 + mvto 9340 49776 + tick rand 40 80 + setv name "whatamI?" 8 + +*Right Lava Bubble + new: simp 1 12 50200 "moe_C2toDS_vflm" 11 21 1 + frat 2 + attr 0 + mvto 9581 49795 + tick rand 40 80 + setv name "whatamI?" 9 + +*VOLCANO MIDDLE + + new: simp 1 12 50200 "moe_C2toDS_vflm" 11 0 1 + attr 0 + mvto 9865 49039 + pose 10 + tick 100 +*volm 0 -900 + setv name "whatamI?" 11 + sndl "m_wn" + +*WORLD WRAP COPY + new: simp 1 12 50200 "moe_C2toDS_vflm" 11 0 1 + attr 0 + mvto 1513 49039 + pose 10 + tick 100 +*volm 0 -900 + setv name "whatamI?" 11 + sndl "m_wn" + +*VOLCANO UPPER + + new: simp 1 12 50200 "moe_C2toDS_vflm" 11 0 1 + attr 0 + mvto 9863 48363 + pose 10 + tick 100 +*volm 0 -800 + setv name "whatamI?" 11 + sndl "m_wn" + +*WORLD WRAP COPY + new: simp 1 12 50200 "moe_C2toDS_vflm" 11 0 1 + attr 0 + mvto 1511 48363 + pose 10 + tick 100 +*volm 0 -800 + setv name "whatamI?" 11 + sndl "m_wn" + +*LAVA BUBBLE SOUNDS (right) + + new: simp 1 12 50200 "moe_C2toDS_vflm" 11 0 1 + attr 0 + mvto 9904 49843 + pose 10 + tick 100 +*volm 0 -900 + sndl "moev" + setv name "whatamI?" 12 + +*WORLD WRAP COPY + + new: simp 1 12 50200 "moe_C2toDS_vflm" 11 0 1 + attr 0 + mvto 1552 49843 + pose 10 + tick 100 +*volm 0 -900 + sndl "moev" + setv name "whatamI?" 12 + +*LAVA BUBBLE SOUNDS (left) + new: simp 1 12 50200 "moe_C2toDS_vflm" 11 0 1 + attr 0 + mvto 9290 49843 + pose 10 + tick 100 +*volm 0 -900 + sndl "moev" + setv name "whatamI?" 12 + +*WORLD WRAP COPY + new: simp 1 12 50200 "moe_C2toDS_vflm" 11 0 1 + attr 0 + mvto 938 49843 + pose 10 + tick 100 +*volm 0 -900 + sndl "moev" + setv name "whatamI?" 12 + +*Volcano Flame + new: simp 1 12 50200 "moe_C2toDS_vflm" 11 0 1 + frat 2 + attr 0 + mvto 9020 49334 + pose 10 + tick 100 + setv name "whatamI?" 1 + + +*Volcano Cap Spouts overlay Left* + + new: comp 1 8 50200 "blnk" 0 0 0 + pat: dull 1 "moe_C2toDS_Overlays" 24 0 0 8000 + + attr 0 + + setv name "whatamI?" 16 + + mvto 9213 49753 + + +*Volcano Cap Spouts overlay Right* + + new: comp 1 8 50200 "blnk" 0 0 0 + pat: dull 1 "moe_C2toDS_Overlays" 25 0 0 8000 + + attr 0 + + setv name "whatamI?" 16 + + mvto 9512 49716 endi endm @@ -118,32 +296,33 @@ scrp 2 19 50214 10 over inst - reps 100 - new: simp 2 19 50215 "moe_C2toDS_volcBubbles" 5 0 rand 200 2000 - mvsf rand 9865 10050 49445 + reps 200 + new: simp 2 19 24206 "moe_C2toDS_volcBubbles" 5 0 rand 200 2000 + mvsf rand 9750 10050 49440 repe slow targ ownr - anim [7 8 9 10 11 12 13] + anim [7 8 9 10 11 12 13 14 15] over frat 2 - anim [14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 255] + anim [20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 255] endm -scrp 2 19 50215 10 +scrp 2 19 24206 10 tick 1 pose rand 0 4 attr 128 setv vely rand 1.01 13.01 - addv velx rand -10 -1 +*addv velx rand -10 -1 + setv velx rand -10 10 accg -1 aero 5 endm -scrp 2 19 50215 9 +scrp 2 19 24206 9 inst doif rtyp room ownr ne 9 and rtyp room ownr ne 8 setv vely rand 1.01 13.01 @@ -151,8 +330,8 @@ scrp 2 19 50215 9 doif rand 0 25 eq 1 setv vely 20 endi - mvsf rand 9865 10050 rand 49450 49500 - setv velx rand -10 -1 + mvsf rand 9750 10050 rand 49450 49500 + setv velx rand -10 10 pose 0 endi setv va00 0 @@ -192,9 +371,30 @@ enum 1 8 50200 endi next +*remove background +enum 1 12 50200 + doif name "whatamI?" eq 15 + kill targ + endi +next + +*fix volcano caps +*enum 1 8 50200 +* doif targ ne null +* doif name "whatamI?" eq 16 +* show 1 +* endi +* endi +*next + enum 2 19 50214 kill targ next + +enum 2 19 24206 + kill targ +next + enum 2 19 50215 kill targ next @@ -203,21 +403,7 @@ enum 3 3 50202 kill targ next - - -scrx 3 3 50202 10 -scrx 3 3 50202 1 -scrx 3 3 50202 1 -scrx 3 3 50202 10 -scrx 3 3 50202 1 - -scrx 2 19 50215 10 -scrx 2 19 50215 9 -scrx 2 19 50215 10 -scrx 2 19 50215 9 -scrx 2 19 50215 10 -scrx 2 19 50215 9 - -scrx 2 19 50214 10 scrx 2 19 50214 10 -scrx 2 19 50214 10 \ No newline at end of file +scrx 2 19 24206 10 +scrx 2 19 24206 9 +scrx 3 3 50202 1 \ No newline at end of file diff --git a/dev/Scripts/1.2_World_Overlays.cos b/dev/Scripts/1.2_World_Overlays.cos index 27c30e0..e71cfa7 100644 --- a/dev/Scripts/1.2_World_Overlays.cos +++ b/dev/Scripts/1.2_World_Overlays.cos @@ -1019,8 +1019,9 @@ pat: dull 1 "moe_C2toDS_Overlays" 24 0 0 8000 attr 0 -mvto 9213 49753 +setv name "whatamI?" 16 +mvto 9213 49753 *Volcano Cap Spouts overlay Right* @@ -1030,8 +1031,9 @@ pat: dull 1 "moe_C2toDS_Overlays" 25 0 0 8000 attr 0 -mvto 9512 49716 +setv name "whatamI?" 16 +mvto 9512 49716 *Visible heat* diff --git a/dev/Scripts/1.6_AppletToolbar.cos b/dev/Scripts/1.6_AppletToolbar.cos index 9473773..e291be0 100644 --- a/dev/Scripts/1.6_AppletToolbar.cos +++ b/dev/Scripts/1.6_AppletToolbar.cos @@ -27,13 +27,15 @@ setv game "C2toDS_PopCtrl_Goldfish" va00 setv game "C2toDS_PopCtrl_Jellyfish" va00 setv game "C2toDS_PopCtrl_Zander" va00 setv game "C2toDS_PopCtrl_Red Butterfly" va00 -setv game "C2toDS_PopCtrl_Purple Butteryfly" va00 +setv game "C2toDS_PopCtrl_Purple Butterfly" va00 +setv game "C2toDS_PopCtrl_Yellow Butterfly" va00 setv game "C2toDS_PopCtrl_Snails" va00 -setv game "C2toDS_PopCtrl_BlueBirds" va00 +setv game "C2toDS_PopCtrl_Bluebirds" va00 setv game "C2toDS_PopCtrl_Bees" va00 setv game "C2toDS_PopCtrl_Hummingbirds" va00 -setv game "C2toDS_PopCtrl_Wasp" va00 +setv game "C2toDS_PopCtrl_Wasps" va00 setv game "C2toDS_PopCtrl_Ants" va00 +setv game "C2toDS_PopCtrl_Cacti" va00 scrp 1 1 50204 10 attr 306 diff --git a/dev/Scripts/1.6_Eco_Fairy.cos b/dev/Scripts/1.6_Eco_Fairy.cos index 71a6d98..079a71b 100644 --- a/dev/Scripts/1.6_Eco_Fairy.cos +++ b/dev/Scripts/1.6_Eco_Fairy.cos @@ -791,7 +791,7 @@ scrp 1 1 50203 9 retn subr Crabs - doif game "C2toDS_PopCtrl_Crabs" eq 1 + doif game "C2toDS_PopCtrl_Crabs" eq 1 and sean lt 3 setv va00 2 setv va01 13 setv va02 50211 diff --git a/dev/Scripts/1.6_WindSock.cos b/dev/Scripts/1.6_WindSock.cos index 9420473..5e9c172 100644 --- a/dev/Scripts/1.6_WindSock.cos +++ b/dev/Scripts/1.6_WindSock.cos @@ -8,7 +8,7 @@ pose 3 *This one was placed on a best-guess for positioning. May need to fine-tune to be lore accurate. new: simp 2 19 50216 "moe_C2toDS_sock" 56 0 2000 -mvto 5800 47950 +mvto 5810 47950 pose 3 scrp 2 19 50216 10 @@ -49,7 +49,7 @@ scrp 2 19 50216 9 setv va04 prop grap posx posy 2 subv va03 va04 - dbg: outv va03 +*dbg: outv va03 doif va03 lt .015 *stand still diff --git a/dev/Scripts/2.0_Carrots.cos b/dev/Scripts/2.0_Carrots.cos index 89f634a..91a4f08 100644 --- a/dev/Scripts/2.0_Carrots.cos +++ b/dev/Scripts/2.0_Carrots.cos @@ -224,7 +224,7 @@ scrp 2 3 50200 9 setv ov02 post - subv ov02 10 + subv ov02 15 setv ov01 post @@ -304,7 +304,7 @@ scrp 2 3 50200 10 tick rand 200 350 - rnge 200 + rnge rand 100 200 *dcor 1 diff --git a/dev/Scripts/2.0_Nuts.cos b/dev/Scripts/2.0_Nuts.cos index f39e1bd..ef2b159 100644 --- a/dev/Scripts/2.0_Nuts.cos +++ b/dev/Scripts/2.0_Nuts.cos @@ -353,7 +353,7 @@ scrp 2 3 50202 9 else - stop + kill targ endi @@ -722,7 +722,7 @@ scrp 2 4 50202 9 frel ownr - mvsf va00 va01 + mvto va00 va01 mira va03 @@ -770,7 +770,7 @@ scrp 2 4 50202 9 frel ownr - mvsf va00 va01 + mvto va00 va01 mira va03 @@ -818,7 +818,7 @@ scrp 2 4 50202 9 frel ownr - mvsf va00 va01 + mvto va00 va01 mira va03 @@ -852,7 +852,7 @@ scrp 2 3 50202 10 elas 25 - fric 35 + fric 50 puhl -1 28 18 @@ -941,7 +941,7 @@ scrp 2 3 50202 1001 endi - tick rand 1000 2500 + tick rand 500 1500 doif ov00 eq 1 @@ -951,19 +951,23 @@ scrp 2 3 50202 1001 targ ov01 - seta ov01 null + doif targ ne null + seta ov01 null + endi elif ov02 eq 1 targ ov01 - - seta ov02 null + doif targ ne null + seta ov02 null + endi elif ov02 eq 2 targ ov01 - - seta ov03 null + doif targ ne null + seta ov03 null + endi endi diff --git a/dev/Scripts/2.0_Pears.cos b/dev/Scripts/2.0_Pears.cos index a3229e3..edf66f3 100644 --- a/dev/Scripts/2.0_Pears.cos +++ b/dev/Scripts/2.0_Pears.cos @@ -240,7 +240,7 @@ scrp 2 3 50204 10 rnge 500 - fric 25 + fric 50 tick rand 50 75 @@ -453,7 +453,7 @@ scrp 2 3 50204 9 kill targ endi - targ ownr + kill ownr retn @@ -1528,9 +1528,11 @@ scrp 2 8 50204 1001 targ ov01 - setv ov01 0 + doif targ ne null + setv ov01 0 - seta ov04 null + seta ov04 null + endi elif pose eq 1 @@ -1538,9 +1540,11 @@ scrp 2 8 50204 1001 targ ov01 - setv ov02 0 + doif targ ne null + setv ov02 0 - seta ov05 null + seta ov05 null + endi elif pose eq 2 @@ -1548,9 +1552,11 @@ scrp 2 8 50204 1001 targ ov01 - setv ov03 0 + doif targ ne null + setv ov03 0 - seta ov06 null + seta ov06 null + endi endi diff --git a/dev/Scripts/2.0_Potato.cos b/dev/Scripts/2.0_Potato.cos index d2a3fad..7a269ae 100644 --- a/dev/Scripts/2.0_Potato.cos +++ b/dev/Scripts/2.0_Potato.cos @@ -223,7 +223,7 @@ scrp 2 3 50201 9 setv ov02 post - subv ov02 15 + subv ov02 24 setv ov01 post @@ -301,7 +301,7 @@ scrp 2 3 50201 10 tick rand 200 350 - rnge 200 + rnge rand 100 200 *dcor 1 @@ -333,7 +333,7 @@ scrp 2 11 50201 10 inst - attr 5 + attr 3 elas 10 diff --git a/dev/Scripts/2.0_Triffids.cos b/dev/Scripts/2.0_Triffids.cos index 896e5a4..1d3d4fd 100644 --- a/dev/Scripts/2.0_Triffids.cos +++ b/dev/Scripts/2.0_Triffids.cos @@ -192,6 +192,8 @@ scrp 2 3 50205 10 perm 50 + fric 50 + slow wait 1 @@ -428,7 +430,7 @@ scrp 2 3 50205 9 else - stop + kill targ endi @@ -1221,7 +1223,9 @@ scrp 2 8 50205 1001 targ ov01 +doif targ ne null setv ov00 0 +endi elif ov02 eq 2 @@ -1230,8 +1234,9 @@ scrp 2 8 50205 1001 pose 10 targ ov01 - +doif targ ne null setv ov01 0 + endi else @@ -1240,9 +1245,9 @@ scrp 2 8 50205 1001 pose 5 targ ov01 - +doif targ ne null setv ov02 0 - +endi endi targ ownr @@ -1252,9 +1257,11 @@ scrp 2 8 50205 1001 setv ov00 0 doif carr eq null - - mvsf posl post - + doif tmvt posl post eq 1 + mvsf posl post + else + kill targ + endi endi endm diff --git a/dev/Scripts/2.0_Trumpet.cos b/dev/Scripts/2.0_Trumpet.cos index 1ab77c2..3d3b718 100644 --- a/dev/Scripts/2.0_Trumpet.cos +++ b/dev/Scripts/2.0_Trumpet.cos @@ -83,7 +83,7 @@ scrp 2 23 50203 10 fric 30 accg 3 - + bhvr 11 endm @@ -141,7 +141,7 @@ scrp 2 23 50203 2 stim writ from 90 1 endi mesg writ ownr 0 - + endm *hit @@ -151,7 +151,7 @@ scrp 2 23 50203 3 doif crea from eq 1 stim writ from 92 1 endi - + snde "hit_" velo rand -2 2 rand -10 -5 @@ -213,9 +213,9 @@ scrp 2 3 50203 12 targ from - *chem 5 .19 +*chem 5 .19 - *chem 10 .19 +*chem 10 .19 snde "chwp" @@ -464,7 +464,11 @@ scrp 2 3 50203 9 new: simp 2 7 50203 "moe_C2toDS_trumpet" 31 19 rand 500 2500 - mvsf va00 va01 + doif tmvt va00 va01 eq 1 + mvto va00 va01 + else + kill targ + endi @@ -1060,8 +1064,9 @@ scrp 2 8 50203 1001 pose 5 targ ov01 - - setv ov00 0 + doif targ ne null + setv ov00 0 + endi elif ov02 eq 2 @@ -1070,8 +1075,9 @@ scrp 2 8 50203 1001 pose 5 targ ov01 - - setv ov01 0 + doif targ ne null + setv ov01 0 + endi else @@ -1080,8 +1086,9 @@ scrp 2 8 50203 1001 pose 5 targ ov01 - - setv ov02 0 + doif targ ne null + setv ov02 0 + endi endi @@ -1154,7 +1161,7 @@ scrp 2 8 50203 10 bhvr 48 untl va00 eq 4 - + bhvr 48 attr 231 @@ -1386,4 +1393,4 @@ enum 2 10 50203 kill targ -next +next \ No newline at end of file